Skip to content

Commit

Permalink
Test with Python 3.8.
Browse files Browse the repository at this point in the history
This also publishes the tox-and-node docker image.
  • Loading branch information
manthey committed Mar 25, 2020
1 parent c67ca6f commit 04ee2ad
Show file tree
Hide file tree
Showing 20 changed files with 82 additions and 18 deletions.
36 changes: 35 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ executors:
toxandnode:
working_directory: ~/project
docker:
- image: zachmullen/tox-and-node
- image: girder/tox-and-node
- image: memcached
- image: circleci/mongo:4.0-ram
- image: rabbitmq
Expand Down Expand Up @@ -34,6 +34,18 @@ commands:
command: for i in $(seq 1 10); do [ $i -gt 1 ] && echo "retrying $i" && sleep 5; codecov --required --disable search pycov gcov --root project --file build/test/coverage/py_coverage.xml build/test/coverage/cobertura-coverage.xml && s=0 && break || s=$?; done; (exit $s)

jobs:
testdocker:
machine: true
steps:
- checkout
- run:
name: Build the test docker
command: docker build --force-rm -t girder/tox-and-node --build-arg SKIP_TOX=true .
- run:
name: Publish the images to Docker Hub
command: |
echo "$DOCKERHUB_PASS" | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
docker push girder/tox-and-node:latest
py27:
executor: toxandnode
steps:
Expand Down Expand Up @@ -62,6 +74,13 @@ jobs:
- tox:
env: py37
- coverage
py38:
executor: toxandnode
steps:
- checkout
- tox:
env: py38
- coverage
lint_and_docs:
executor: toxandnode
steps:
Expand Down Expand Up @@ -89,6 +108,13 @@ workflows:
version: 2
ci:
jobs:
- testdocker:
filters:
branches:
only:
- master
# Create a branch of this name to push to docker hub
- testdocker
- py27:
filters:
tags:
Expand Down Expand Up @@ -117,6 +143,13 @@ workflows:
branches:
ignore:
- gh-pages
- py38:
filters:
tags:
only: /^v.*/
branches:
ignore:
- gh-pages
- lint_and_docs:
filters:
tags:
Expand All @@ -130,6 +163,7 @@ workflows:
- py35
- py36
- py37
- py38
- lint_and_docs
filters:
tags:
Expand Down
9 changes: 9 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
build
test
.git
girder
girder_annotation
large_image
sources
tasks
examples
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ python:
- "3.5"
- "3.6"
- "3.7"
- "3.8"
services:
- mongodb
- memcached
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM themattrix/tox

RUN curl -sL https://deb.nodesource.com/setup_11.x | bash - && \
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
apt-get install -y nodejs bzip2
3 changes: 2 additions & 1 deletion girder/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'enum34>=1.1.6;python_version<"3.4"',
Expand Down
3 changes: 2 additions & 1 deletion girder_annotation/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'jsonschema>=2.5.1',
Expand Down
3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Top level dependencies
girder>=3.0.4
girder>=3.0.4 ; python_version < '3.8'
girder>=3.0.13.dev6 ; python_version >= '3.8'
girder-jobs>=3.0.3
-e sources/dummy
-e sources/gdal
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'cachetools>=3.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/dummy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/gdal/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/mapnik/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/nd2/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/ometiff/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/openjpeg/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/openslide/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/pil/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/test/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
3 changes: 2 additions & 1 deletion sources/tiff/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ def prerelease_local_scheme(version):
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7'
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
],
install_requires=[
'large-image>=1.0.0',
Expand Down
7 changes: 6 additions & 1 deletion tasks/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,12 @@ def prerelease_local_scheme(version):
'License :: OSI Approved :: Apache Software License',
'Topic :: Scientific/Engineering',
'Intended Audience :: Science/Research',
'Programming Language :: Python'
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
],
install_requires=[
'girder-worker>=0.6.0',
Expand Down
3 changes: 2 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
envlist =
py{27,35,36,37}
py{27,35,36,37,38}
docs
flake8
lintclient
Expand All @@ -14,6 +14,7 @@ python =
3.5: py35
3.6: py36
3.7: py37, docs, flake8, lintclient, lintannotationclient
3.8: py38

[testenv]
install_command = pip install --upgrade --upgrade-strategy eager --find-links https://girder.github.io/large_image_wheels {opts} .[memcached] {packages}
Expand Down

0 comments on commit 04ee2ad

Please sign in to comment.