Skip to content

Commit

Permalink
Remove/add testing for python 3.6/3.9, update CI pinnings (#257)
Browse files Browse the repository at this point in the history
* Remove unchanged dev environment

* Bump CI / docs to support python 3.9

* Make latest environment a symbolic link

* Leave 3.9 environment pinned for now

* Use mamba solver to parse through conflicts easier

* Unpin some 3.9 dependencies

* Unpin more 3.9 dependencies

* Unpin all 3.9 dependencies

* Pin 3.9 testing dependencies

* Temporarily unpin 3.7 / 3.8 deps

* Update 3.7 / 3.8 dep pinnings

* Pin dask to 2.8.1 for 3.7/3.8, check for pinning changes

* Repin 3.7/3.8 deps
  • Loading branch information
charlesbluca committed Feb 12, 2022
1 parent 8e784e0 commit 890933e
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ Before you submit a pull request, check that it meets these guidelines:
2. If the pull request adds functionality, the docs should be updated. Put
your new functionality into a function with a docstring, and add the
feature to the list in README.rst.
3. The pull request should work for Python 3.6, 3.7, and 3.8.
3. The pull request should work for Python 3.7, 3.8, and 3.9.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
fail-fast: true
matrix:
os: ["windows-latest", "ubuntu-latest", "macos-latest"]
python-version: ["3.6", "3.7", "3.8"]
python-version: ["3.7", "3.8", "3.9"]

steps:
- name: Checkout source
Expand All @@ -22,7 +22,8 @@ jobs:
- name: Setup Conda Environment
uses: conda-incubator/setup-miniconda@v2
with:
miniconda-version: "latest"
miniforge-variant: Mambaforge
use-mamba: true
python-version: ${{ matrix.python-version }}
environment-file: continuous_integration/environment-${{ matrix.python-version }}.yml
activate-environment: dask-image-testenv
Expand Down
19 changes: 0 additions & 19 deletions continuous_integration/environment-3.6.yml

This file was deleted.

22 changes: 11 additions & 11 deletions continuous_integration/environment-3.7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ channels:

dependencies:
- python=3.7.*
- pip==19.0.1
- wheel==0.32.3
- coverage==4.5.2
- flake8==3.7.2
- pytest==5.2.0
- pytest-flake8==1.0.4
- pip==22.0.3
- wheel==0.37.1
- coverage==6.3.1
- flake8==4.0.1
- pytest==7.0.0
- pytest-flake8==1.0.7
- dask==2.8.1
- numpy==1.15.4
- scipy==1.2.0
- scikit-image==0.14.2
- pims==0.4.1
- slicerator
- numpy==1.21.5
- scipy==1.7.3
- scikit-image==0.19.1
- pims==0.5
- slicerator==1.0.0
20 changes: 0 additions & 20 deletions continuous_integration/environment-3.8-dev.yml

This file was deleted.

22 changes: 11 additions & 11 deletions continuous_integration/environment-3.8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ channels:

dependencies:
- python=3.8.*
- pip==19.3.1
- wheel==0.33.6
- coverage==4.5.4
- flake8==3.7.9
- pytest==5.3.1
- pytest-flake8==1.0.4
- pip==22.0.3
- wheel==0.37.1
- coverage==6.3.1
- flake8==4.0.1
- pytest==7.0.0
- pytest-flake8==1.0.7
- dask==2.8.1
- numpy==1.17.3
- scipy==1.3.2
- scikit-image==0.16.2
- pims==0.4.1
- slicerator
- numpy==1.22.2
- scipy==1.8.0
- scikit-image==0.19.1
- pims==0.5
- slicerator==1.0.0
19 changes: 19 additions & 0 deletions continuous_integration/environment-3.9.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: dask-image-testenv

channels:
- conda-forge

dependencies:
- python=3.9.*
- pip==22.0.2
- wheel==0.37.1
- coverage==6.3
- flake8==4.0.1
- pytest==6.2.5
- pytest-flake8==1.0.7
- dask==2022.1.1
- numpy==1.22.1
- scipy==1.7.3
- scikit-image==0.19.1
- pims==0.5
- slicerator==1.0.0
19 changes: 0 additions & 19 deletions continuous_integration/environment-latest.yml

This file was deleted.

1 change: 1 addition & 0 deletions continuous_integration/environment-latest.yml
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,10 @@ def run_tests(self):
"License :: OSI Approved :: BSD License",
"Natural Language :: English",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
tests_require=test_requirements
)

0 comments on commit 890933e

Please sign in to comment.