Skip to content

Commit

Permalink
Support Python 3.8 with CI tests (and drop python 3.5) (#131)
Browse files Browse the repository at this point in the history
* Appveyor python3.8 test environment

* CircleCI python3.8 test environment

* Travis python3.8 test environment

* Mention python 3.8 in the pull request template

* Add python 3.8 to setup.py tags

* Add empty .coveralls.yml

* Garbage commit needed to re-trigger CircleCI builds again

* Add content to .coveralls.yml

* Drop support for python 3.5

* Remove python 3.5 jobs from continuous integration

* Remove Travis python 3.5 job

* Update CircleCI build jobs list

* Update miniconda to 4.8.2 for CI

* Update Appveyor miniconda to 4.8.2

* Update MD5 hash for miniconda

* Update Travis miniconda to 4.8.2

* Update CircleCI miniconda to 4.8.2
  • Loading branch information
GenevieveBuckley committed May 6, 2020
1 parent e77c0f6 commit a9daab5
Show file tree
Hide file tree
Showing 15 changed files with 78 additions and 82 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ branches:

environment:
matrix:
- PYVER: 38
- PYVER: 37
- PYVER: 36
- PYVER: 35

install:
# If there is a newer build queued for the same PR, cancel this one.
Expand Down
21 changes: 0 additions & 21 deletions .appveyor_support/environments/tst_py35.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .appveyor_support/environments/tst_py38.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: dask_image_py38_env

channels:
- conda-forge

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
- dask==2.8.1
- numpy==1.17.3
- scipy==1.3.2
- scikit-image==0.16.2
- pims==0.4.1
- slicerator==1.0.0
6 changes: 3 additions & 3 deletions .appveyor_support/install_miniconda.bat
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
@echo on

:: Miniconda Config:
set "MINICONDA_VERSION=4.5.4"
set "MINICONDA_MD5=1c73051ccd997770288275ee6474b423"
set "MINICONDA_VERSION=4.8.2"
set "MINICONDA_MD5=20d6bd9b3bd62f1fd874315b6b38c159"
set "MINICONDA_INSTALLER=%USERPROFILE%\miniconda.exe"
set "MINICONDA_DIR=%USERPROFILE%\miniconda"
set "MINICONDA_URL=https://repo.continuum.io/miniconda/Miniconda3-%MINICONDA_VERSION%-Windows-x86_64.exe"
set "MINICONDA_URL=https://repo.anaconda.com/miniconda/Miniconda3-py37_%MINICONDA_VERSION%-Windows-x86_64.exe"

:: Install Miniconda.
powershell -Command "(New-Object Net.WebClient).DownloadFile('%MINICONDA_URL%', '%MINICONDA_INSTALLER%')"
Expand Down
14 changes: 7 additions & 7 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
version: 2

jobs:
build_py37:
build_py38:
working_directory: ~/test
machine: true
environment:
- PYVER: "37"
- PYVER: "38"
steps:
- checkout
- run:
Expand Down Expand Up @@ -45,11 +45,11 @@ jobs:
source .circleci/create_env.sh
coveralls
build_py36:
build_py37:
working_directory: ~/test
machine: true
environment:
- PYVER: "36"
- PYVER: "37"
steps:
- checkout
- run:
Expand Down Expand Up @@ -89,11 +89,11 @@ jobs:
source .circleci/create_env.sh
coveralls
build_py35:
build_py36:
working_directory: ~/test
machine: true
environment:
- PYVER: "35"
- PYVER: "36"
steps:
- checkout
- run:
Expand Down Expand Up @@ -137,6 +137,6 @@ workflows:
version: 2
build_and_test:
jobs:
- build_py38
- build_py37
- build_py36
- build_py35
21 changes: 0 additions & 21 deletions .circleci/environments/tst_py35.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .circleci/environments/tst_py38.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: dask_image_py38_env

channels:
- conda-forge

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
- dask==2.8.1
- numpy==1.17.3
- scipy==1.3.2
- scikit-image==0.16.2
- pims==0.4.1
- slicerator==1.0.0
6 changes: 3 additions & 3 deletions .circleci/install_miniconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
set -xeuo pipefail

# Miniconda Config:
export MINICONDA_VERSION="4.5.4"
export MINICONDA_MD5="a946ea1d0c4a642ddf0c3a26a18bb16d"
export MINICONDA_VERSION="4.8.2"
export MINICONDA_MD5="87e77f097f6ebb5127c77662dfc3165e"
export MINICONDA_INSTALLER="${HOME}/miniconda.sh"
export MINICONDA_DIR="${HOME}/miniconda"
export MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-Linux-x86_64.sh"
export MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-py37_${MINICONDA_VERSION}-Linux-x86_64.sh"

# Install Miniconda.
curl -L "${MINICONDA_URL}" > "${MINICONDA_INSTALLER}"
Expand Down
1 change: 1 addition & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
repo_token: mu5JxVQy1FJSQvhczAzyHvaXx4qfHhF1R
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ 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.5, 3.6, and 3.7. Check
3. The pull request should work for Python 3.6, 3.7, and 3.8. Check
https://travis-ci.org/dask/dask-image/pull_requests
and make sure that the tests pass for all supported Python versions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ os: osx
osx_image: xcode9.4

env:
- PYVER="38"
- PYVER="37"
- PYVER="36"
- PYVER="35"

install:
# Install and Configure Miniconda.
Expand Down
21 changes: 0 additions & 21 deletions .travis_support/environments/tst_py35.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .travis_support/environments/tst_py38.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: dask_image_py38_env

channels:
- conda-forge

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
- dask==2.8.1
- numpy==1.17.3
- scipy==1.3.2
- scikit-image==0.16.2
- pims==0.4.1
- slicerator==1.0.0
6 changes: 3 additions & 3 deletions .travis_support/install_miniconda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
set -xeuo pipefail

# Miniconda Config:
export MINICONDA_VERSION="4.5.12"
export MINICONDA_MD5="a583d1e174e1dc960e87fb4b026a9370"
export MINICONDA_VERSION="4.8.2"
export MINICONDA_MD5="e0320c20ea13d04407424ecf57b70eaf"
export MINICONDA_INSTALLER="${HOME}/miniconda.sh"
export MINICONDA_DIR="${HOME}/miniconda"
export MINICONDA_URL="https://repo.continuum.io/miniconda/Miniconda3-${MINICONDA_VERSION}-MacOSX-x86_64.sh"
export MINICONDA_URL="https://repo.anaconda.com/miniconda/Miniconda3-py37_${MINICONDA_VERSION}-MacOSX-x86_64.sh"

# Install Miniconda.
curl -L "${MINICONDA_URL}" > "${MINICONDA_INSTALLER}"
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ def run_tests(self):
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
],
tests_require=test_requirements
)

0 comments on commit a9daab5

Please sign in to comment.