Merge pull request #429 from girder/python3.8

Test with Python 3.8.

.circleci/config.yml

@@ -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
@@ -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:
@@ -62,6 +74,13 @@ jobs:
       - tox:
           env: py37
       - coverage
+  py38:
+    executor: toxandnode
+    steps:
+      - checkout
+      - tox:
+          env: py38
+      - coverage
   lint_and_docs:
     executor: toxandnode
     steps:
@@ -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:
@@ -117,6 +143,13 @@ workflows:
             branches:
               ignore:
                 - gh-pages
+      - py38:
+          filters:
+            tags:
+              only: /^v.*/
+            branches:
+              ignore:
+                - gh-pages
       - lint_and_docs:
           filters:
             tags:
@@ -130,6 +163,7 @@ workflows:
             - py35
             - py36
             - py37
+            - py38
             - lint_and_docs
           filters:
             tags:

.dockerignore

@@ -0,0 +1,9 @@
+build
+test
+.git
+girder
+girder_annotation
+large_image
+sources
+tasks
+examples

.travis.yml

@@ -6,6 +6,7 @@ python:
   - "3.5"
   - "3.6"
   - "3.7"
+  - "3.8"
 services:
   - mongodb
   - memcached

Dockerfile

@@ -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

girder/setup.py

@@ -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"',

girder_annotation/setup.py

@@ -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',

requirements-dev.txt

@@ -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

setup.py

@@ -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',

sources/dummy/setup.py

@@ -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',

sources/gdal/setup.py

@@ -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',

sources/mapnik/setup.py

@@ -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',

sources/nd2/setup.py

@@ -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',

sources/ometiff/setup.py

@@ -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',

sources/openjpeg/setup.py

@@ -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',

sources/openslide/setup.py

@@ -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',

sources/pil/setup.py

@@ -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',

sources/test/setup.py

@@ -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',

sources/tiff/setup.py

@@ -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',

tasks/setup.py

@@ -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',

tox.ini

@@ -1,6 +1,6 @@
 [tox]
 envlist =
-  py{27,35,36,37}
+  py{27,35,36,37,38}
   docs
   flake8
   lintclient
@@ -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}