Merge branch 'devel' into update_load_img

SNflows · Mar 10, 2022 · 2ff032e · 2ff032e
2 parents 7d264ec + a3ac086
commit 2ff032e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,25 +22,25 @@ jobs:
       with:
           persist-credentials: true
 
-    - name: Setup Python 3.8
+    - name: Setup Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Cache pip
       uses: actions/cache@v2
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-py3.8-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-pip-py3.9-${{ hashFiles('requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-pip-py3.8-
+          ${{ runner.os }}-pip-py3.9-
           ${{ runner.os }}-pip-
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip wheel
-        grep "numpy" requirements.txt | xargs -I {} pip install "{}"
         pip install -r requirements.txt
+        pip install -r dev_requirements.txt
 
     - name: Lint with flake8
       run: |
@@ -57,7 +57,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: [3.8]
+        python-version: [3.9, '3.10']
         include:
         - os: ubuntu-latest
           pippath: ~/.cache/pip
@@ -109,17 +109,17 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip wheel
-        grep "numpy" requirements.txt | xargs -I {} pip install "{}"
         pip install -r requirements.txt
+        pip install -r dev_requirements.txt
         pip install codecov pytest-cov
 
-    - name: Testing
+    - name: Coverage testing
       continue-on-error: true
       run: pytest --cov
 
     - name: Upload coverage
       continue-on-error: true
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v2
       with:
         env_vars: OS,PYTHON
 
@@ -148,25 +148,25 @@ jobs:
     - name: Git LFS Pull
       run: git lfs pull
 
-    - name: Setup Python 3.8
+    - name: Setup Python 3.9
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Cache pip
       uses: actions/cache@v2
       with:
         path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-py3.8-${{ hashFiles('requirements.txt') }}
+        key: ${{ runner.os }}-pip-py3.9-${{ hashFiles('requirements.txt') }}
         restore-keys: |
-          ${{ runner.os }}-pip-py3.8-
+          ${{ runner.os }}-pip-py3.9-
           ${{ runner.os }}-pip-
 
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip wheel
-        grep "numpy" requirements.txt | xargs -I {} pip install "{}"
         pip install -r requirements.txt
+        pip install -r dev_requirements.txt
 
     - name: Update VERSION file
       run: python -c "from flows import version; version.update_release_version();"

diff --git a/dev_requirements.txt b/dev_requirements.txt
@@ -0,0 +1,5 @@
+pytest
+flake8
+flake8-tabs >= 2.3.2
+flake8-builtins
+flake8-logging-format
diff --git a/requirements.txt b/requirements.txt
@@ -1,15 +1,10 @@
-pytest
-flake8
-flake8-tabs >= 2.3.2
-flake8-builtins
-flake8-logging-format
 numpy >= 1.16
 scipy >= 1.5.4
-astropy == 4.1
-photutils == 1.1.0; python_version >= '3.7'
-Bottleneck == 1.3.2
-matplotlib == 3.3.1
-mplcursors == 0.3
+astropy >= 5.0.1
+photutils == 1.1.0
+Bottleneck >= 1.3.4
+matplotlib >= 3.3.1
+mplcursors >= 0.3
 seaborn
 pandas
 requests