From cacef2a91e1f4f24468412e6f92edbb6797079c0 Mon Sep 17 00:00:00 2001 From: Corey Shields Date: Sun, 1 Sep 2019 10:39:39 -0400 Subject: [PATCH] python3 - finally Switch from python2 to python3 container Signed-off-by: Corey Shields --- .gitlab-ci.yml | 26 +++----------------------- Dockerfile | 2 +- requirements-dev.txt | 21 ++++++--------------- requirements.txt | 26 +++++++++++++++----------- setup.cfg | 2 +- tox.ini | 29 +---------------------------- 6 files changed, 27 insertions(+), 79 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9635b97..65d034d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,19 +16,12 @@ static_js_css: paths: - db/static/lib static: - stage: static - image: python:2 - before_script: - - pip install tox~=3.8.0 - script: - - tox -e "py2-flake8,isort,yapf,py2-pylint" -static3: stage: static image: python:3 before_script: - pip install tox~=3.8.0 script: - - tox -e "py3-flake8,py3-pylint" + - tox -e "py3-flake8,isort,yapf,py3-pylint" docs: stage: build image: python:3 @@ -43,19 +36,6 @@ docs: paths: - docs/_build/html build: - stage: build - image: python:2 - before_script: - - pip install tox~=3.8.0 - script: - - rm -rf dist - - tox -e py2-build - artifacts: - expire_in: 1 week - when: always - paths: - - dist -build3: stage: build image: python:3 before_script: @@ -70,11 +50,11 @@ build3: - dist test: stage: test - image: python:2 + image: python:3 before_script: - pip install tox~=3.8.0 script: - - tox -e deps,py2-pytest + - tox -e deps,py3-pytest docker: stage: deploy image: docker:18.09 diff --git a/Dockerfile b/Dockerfile index a6a8d4d..dfdc202 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2 +FROM python:3 MAINTAINER SatNOGS project WORKDIR /workdir/ diff --git a/requirements-dev.txt b/requirements-dev.txt index 2550ce3..50dd10c 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -8,31 +8,22 @@ Faker==0.8.18 apipkg==1.5 atomicwrites==1.3.0 attrs==19.1.0 -configparser==3.7.4 -contextlib2==0.5.5 -coverage==4.5.3 +coverage==4.5.4 docopt==0.6.1 docopts==0.6.1 -execnet==1.6.0 +execnet==1.7.1 factory-boy==2.11.1 -funcsigs==1.0.2 -importlib-metadata==0.18 -ipaddress==1.0.22 mock==2.0.0 -more-itertools==5.0.0 -packaging==19.0 -pathlib2==2.3.4 -pbr==5.4.0 +packaging==19.1 +pbr==5.4.2 pluggy==0.12.0 pur==5.2.2 py==1.8.0 -pyparsing==2.4.0 +pyparsing==2.4.2 pytest-cov==2.6.1 pytest-django==3.4.8 pytest-forked==0.2 pytest-xdist==1.25.0 -pytest==4.6.4 -scandir==1.10.0 +pytest==5.1.2 text-unidecode==1.2 wcwidth==0.1.7 -zipp==0.5.1 diff --git a/requirements.txt b/requirements.txt index 210f1ca..7ca1624 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,14 +3,15 @@ # Please edit 'setup.cfg' to add top-level dependencies and use # './contrib/refresh-requirements.sh to regenerate this file -amqp==2.5.0 -billiard==3.6.0.0 +amqp==2.5.1 +billiard==3.6.1.0 celery==4.3.0 certifi==2019.6.16 chardet==3.0.4 Click==7.0 +defusedxml==0.6.0 dj-database-url==0.5.0 -Django==1.11.22 +Django==1.11.23 django-allauth==0.35.0 django-appconf==1.0.3 django-avatar==4.1.0 @@ -24,27 +25,29 @@ django-shortuuidfield==0.1.3 djangorestframework==3.7.7 dnspython==1.16.0 enum34==1.1.6 -eventlet==0.25.0 +eventlet==0.25.1 greenlet==0.4.15 gunicorn==19.9.0 idna==2.8 -influxdb==5.2.2 +importlib-metadata==0.19 +influxdb==5.2.3 kaitaistruct==0.8 -kombu==4.6.3 -lxml==4.3.4 +kombu==4.6.4 +lxml==4.4.1 Markdown==2.6.11 monotonic==1.5 +more-itertools==7.2.0 mysqlclient==1.3.14 -oauthlib==3.0.2 +oauthlib==3.1.0 Pillow==6.1.0 PyJWT==1.7.1 python-dateutil==2.8.0 python-decouple==3.1 python-dotenv==0.6.5 -python-openid==2.2.5 -pytz==2019.1 +python3-openid==3.1.0 +pytz==2019.2 rcssmin==1.0.6 -redis==3.2.1 +redis==3.3.8 requests==2.22.0 requests-oauthlib==1.2.0 rjsmin==1.0.12 @@ -60,3 +63,4 @@ social-auth-core==3.2.0 Unipath==1.1 urllib3==1.24.3 vine==1.3.0 +zipp==0.6.0 diff --git a/setup.cfg b/setup.cfg index 8c2b214..4d9b9c4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,7 @@ classifiers = License :: OSI Approved :: GNU Affero General Public License v3 Operating System :: POSIX :: Linux Programming Language :: Python - Programming Language :: Python :: 2.7 + Programming Language :: Python :: 3 Topic :: Communications :: Ham Radio Topic :: Internet :: WWW/HTTP Topic :: Internet :: WWW/HTTP :: Dynamic Content diff --git a/tox.ini b/tox.ini index d633411..05cc0af 100644 --- a/tox.ini +++ b/tox.ini @@ -1,11 +1,5 @@ [tox] -envlist = {py2,py3}-flake8,isort,yapf,{py2,py3}-{pylint,build},py2-pytest - -[testenv:py2-flake8] -deps = - flake8==3.7.7 -skip_install = True -commands = flake8 +envlist = py3-flake8,isort,yapf,py3-{pylint,build} [testenv:py3-flake8] deps = @@ -35,25 +29,11 @@ deps = skip_install = True commands = yapf -i -r . -[testenv:py2-build] -skip_install = True -commands = - python setup.py sdist bdist_wheel - [testenv:py3-build] skip_install = True commands = python setup.py sdist bdist_wheel -[testenv:py2-pylint] -deps = - pylint==1.9.4 - pylint-django==0.11.1 -extras = dev -commands = pylint \ - {envsitepackagesdir}/db \ - {envsitepackagesdir}/auth0login - [testenv:py3-pylint] deps = pylint==2.3.1 @@ -71,13 +51,6 @@ deps = extras = dev commands = pip check -[testenv:py2-pytest] -install_command = python -m pip install --no-deps {opts} {packages} -deps = - -rrequirements-dev.txt -extras = dev -commands = pytest - [testenv:py3-pytest] install_command = python -m pip install --no-deps {opts} {packages} deps =