Merge pull request #44 from wrightky/master

Fix and update build actions

Author: wrightky

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.7, 3.8, 3.9]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}
@@ -45,41 +45,13 @@ jobs:
         name: codecov-umbrella
         fail_ci_if_error: false
 
-  legacy:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04, windows-2019]
-        python-version: [2.7]
-    env:
-      OS: ${{ matrix.os }}
-      PYTHON: ${{ matrix.python-version }}
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install pytest pytest-cov coveralls
-        pip install -r requirements.txt
-    - name: Install dorado
-      run: |
-        pip install -e .
-    - name: Test with pytest
-      run: |
-        pytest --cov=dorado/ --cov-report=xml
-
   examples:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        python-version: [3.7]
+        python-version: ["3.9"]
     env:
       OS: ${{ matrix.os }}
       PYTHON: ${{ matrix.python-version }}

conda/conda_build_config.yaml

@@ -3,3 +3,6 @@ python:
   - 3.6
   - 3.7
   - 3.8
+  - 3.9
+  - 3.10
+  - 3.11

dorado/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "2.5.2"
+__version__ = "2.5.3"
 
 from . import lagrangian_walker
 from . import parallel_routing

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name = 'pydorado',
-    version = '2.5.2',
+    version = '2.5.3',
     license = 'MIT',
     description = 'dorado - Lagrangian particle routing routine via weighted random walks',
     author = 'J. Hariharan, K. Wright, P. Passalacqua',
@@ -12,10 +12,13 @@
     packages = find_packages(exclude=['*.tests']),
     package_data = {'' : ['*.txt', '*.npz']},
     long_description = 'See project webpage for details: https://github.com/passaH2O/dorado',
-    classifiers = ['Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3.7',
-                   'Programming Language :: Python :: 3.8',
-		   'Programming Language :: Python :: 3.9'],
+    classifiers = [
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
+		'Programming Language :: Python :: 3.9',
+        'Programming Language :: Python :: 3.10'
+        'Programming Language :: Python :: 3.11'],
     install_requires = ['numpy','matplotlib','scipy',
                         'future','tqdm'],
 )

tests/test_examplecases.py

@@ -51,8 +51,9 @@ def test_few_steps_RCM(self):
         # check all positions and times
         assert all_walk_data['xinds'][0] == [16, 17, 18, 19]
         assert all_walk_data['yinds'][0] == [140, 141, 141, 141]
-        assert all_walk_data['travel_times'][0] == \
-            [0, 7007593448.337235, 10439964733.462337, 13698473384.876724]
+        assert all_walk_data['travel_times'][0] == pytest.approx(
+            [0, 7007593448.337235, 10439964733.462337, 13698473384.876724],
+            rel=1e-6)
 
     def test_set_time_RCM_previousdata(self):
         '''
@@ -76,7 +77,8 @@ def test_set_time_RCM_previousdata(self):
         # check all positions and times
         assert all_walk_data['xinds'][0] == [16, 17]
         assert all_walk_data['yinds'][0] == [140, 141]
-        assert all_walk_data['travel_times'][0] == [0, 7007593448.337235]
+        assert all_walk_data['travel_times'][0] == pytest.approx(
+            [0, 7007593448.337235], rel=1e-6)
 
     def test_set_time_RCM(self):
         '''
@@ -101,7 +103,8 @@ def test_set_time_RCM(self):
         # check all positions and times
         assert all_walk_data['xinds'][0] == [16, 17]
         assert all_walk_data['yinds'][0] == [140, 141]
-        assert all_walk_data['travel_times'][0] == [0, 7007593448.337235]
+        assert all_walk_data['travel_times'][0] == pytest.approx(
+            [0, 7007593448.337235], rel=1e-6)
 
 
 class TestANUGA: