updates for python 3.7

Author: blankdots

.travis.yml

@@ -2,7 +2,6 @@ sudo: required
 dist: xenial
 language: python
 
-python: 3.6
 install: true
 
 git:
@@ -31,13 +30,21 @@ jobs:
         - pip install tox-travis
       script: tox -e flake8
     - stage: tests
-      name: "Unit Tests"
+      name: "Unit Tests Python 3.6"
       python: 3.6
       before_script:
         - sudo apt-get update
         - sudo apt-get install libcurl4-openssl-dev
         - pip install tox-travis
-      script: tox
+      script: tox -e py36
+    - stage: tests
+      name: "Unit Tests Python 3.7"
+      python: 3.7
+      before_script:
+        - sudo apt-get update
+        - sudo apt-get install libcurl4-openssl-dev
+        - pip install tox-travis
+      script: tox -e py37
     - stage: tests
       name: "Documentation Tests"
       python: 3.6

Dockerfile

@@ -1,8 +1,8 @@
-FROM python:3.6-alpine3.8 as BUILD
+FROM python:3.7-alpine3.9 as BUILD
 
 RUN apk add --update \
-    && apk add --no-cache build-base curl-dev linux-headers bash git\
-    && apk add --no-cache libressl-dev libffi-dev\
+    && apk add --no-cache build-base curl-dev linux-headers bash git musl-dev\
+    && apk add --no-cache libressl-dev libffi-dev autoconf bzip2-dev xz-dev\
     && rm -rf /var/cache/apk/*
 
 COPY requirements.txt /root/beacon/requirements.txt
@@ -13,15 +13,15 @@ RUN pip install --upgrade pip && \
     pip install -r /root/beacon/requirements.txt && \
     pip install /root/beacon
 
-FROM python:3.6-alpine3.8
+FROM python:3.7-alpine3.9
 
 RUN apk add --no-cache --update bash
 
 LABEL maintainer "CSC Developers"
-LABEL org.label-schema.schema-version="1.3"
+LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.vcs-url="https://github.com/CSCFI/beacon-python"
 
-COPY --from=BUILD usr/local/lib/python3.6/ usr/local/lib/python3.6/
+COPY --from=BUILD usr/local/lib/python3.7/ usr/local/lib/python3.7/
 
 COPY --from=BUILD /usr/local/bin/gunicorn /usr/local/bin/
 

readthedocs.yml

@@ -4,7 +4,7 @@ build:
     image: latest
 requirements_file: docs/docs.txt
 python:
-   version: 3.6
+   version: 3.7
    use_system_site_packages: true
    setup_py_install: true
    extra_requirements:

requirements.txt

@@ -1,10 +1,11 @@
 aiohttp
 aiohttp_cors
 asyncpg
-jsonschema==3.0.1
+jsonschema==3.0.2
 Cython
 numpy
-cyvcf2==0.10.1
+cyvcf2==0.10.1; python_version < '3.7'
+cyvcf2; python_version >= '3.7'
 tox
 uvloop
 aiocache

setup.py

@@ -43,9 +43,10 @@
           'License :: OSI Approved :: Apache Software License',
 
           'Programming Language :: Python :: 3.6',
+          'Programming Language :: Python :: 3.7',
       ],
       install_requires=['aiohttp', 'asyncpg', 'authlib',
-                        'jsonschema==3.0.1', 'gunicorn'],
+                        'jsonschema==3.0.2', 'gunicorn'],
       extras_require={
           'test': ['coverage', 'pytest', 'pytest-cov',
                    'coveralls', 'testfixtures', 'tox',

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py{36},flake8,docs,bandit
+envlist = py{36,37},flake8,docs,bandit
 skipsdist = True
 
 [flake8]
@@ -8,22 +8,19 @@ max-line-length = 160
 max-complexity = 15
 
 [testenv:docs]
-basepython = python3.6
 ; skip_install = true
 deps =
     .[docs]
 commands =  sphinx-build -W -c docs/ -b html docs/ docs/_build/html
             sphinx-build -W -blinkcheck -d docs/_build/doctrees docs/ docs/_build/html
 
 [testenv:bandit]
-basepython = python3.6
 skip_install = true
 deps =
     bandit
 commands = bandit -r beacon_api/ -c .bandit.yml
 
 [testenv:flake8]
-basepython = python3.6
 skip_install = true
 deps =
     pydocstyle==3.0.0
@@ -32,7 +29,6 @@ deps =
 commands = flake8 .
 
 [testenv]
-basepython = python3.6
 passenv = TRAVIS TRAVIS_*
 deps =
     .[test]
@@ -44,4 +40,5 @@ commands = py.test  -x --cov=beacon_api tests/
 [travis]
 unignore_outcomes = True
 python =
-    3.6: py36
+    3.6: py36
+    3.7: py37