Merge branch 'idea/python3' into 'master'
Migrate to Python 3 See merge request librespacefoundation/satnogs/satnogs-network!856merge-requests/856/merge
commit
2370b7eeb9
|
@ -72,15 +72,15 @@ build3:
|
|||
when: always
|
||||
paths:
|
||||
- dist
|
||||
test:
|
||||
test3:
|
||||
stage: test
|
||||
image: ${GITLAB_CI_IMAGE_PYTHON2}
|
||||
image: ${GITLAB_CI_IMAGE_PYTHON3}
|
||||
before_script:
|
||||
- pip install "$GITLAB_CI_PYPI_TOX"
|
||||
- apt-get update
|
||||
- apt-get install -y ruby-sass
|
||||
script:
|
||||
- tox -e deps,py2-pytest
|
||||
- tox -e deps,py3-pytest
|
||||
docker:
|
||||
stage: deploy
|
||||
image: ${GITLAB_CI_IMAGE_DOCKER}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
FROM python:2
|
||||
FROM python:3
|
||||
MAINTAINER SatNOGS project <dev@satnogs.org>
|
||||
|
||||
WORKDIR /workdir/
|
||||
|
|
|
@ -5,23 +5,20 @@
|
|||
-r requirements.txt
|
||||
|
||||
apipkg==1.5
|
||||
atomicwrites==1.3.0
|
||||
attrs==19.3.0
|
||||
coverage==5.0
|
||||
coverage==5.0.2
|
||||
execnet==1.7.1
|
||||
factory-boy==2.11.1
|
||||
Faker==0.8.18
|
||||
filelock==3.0.12
|
||||
funcsigs==1.0.2
|
||||
ipaddress==1.0.23
|
||||
mock==2.0.0
|
||||
packaging==19.2
|
||||
packaging==20.0
|
||||
pbr==5.4.4
|
||||
pluggy==0.13.1
|
||||
pur==5.2.2
|
||||
py==1.8.0
|
||||
pyparsing==2.4.5
|
||||
pytest==4.6.7
|
||||
py==1.8.1
|
||||
pyparsing==2.4.6
|
||||
pytest==5.3.2
|
||||
pytest-cov==2.6.1
|
||||
pytest-django==3.4.8
|
||||
pytest-forked==0.2
|
||||
|
@ -29,6 +26,6 @@ pytest-xdist==1.25.0
|
|||
python-dateutil==2.8.1
|
||||
text-unidecode==1.2
|
||||
toml==0.10.0
|
||||
tox==3.14.2
|
||||
tox==3.14.3
|
||||
virtualenv==16.7.9
|
||||
wcwidth==0.1.7
|
||||
wcwidth==0.1.8
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
amqp==2.5.2
|
||||
args==0.1.0
|
||||
backports.csv==1.0.7
|
||||
billiard==3.5.0.5
|
||||
celery==4.1.1
|
||||
billiard==3.6.1.0
|
||||
celery==4.3.0
|
||||
certifi==2019.11.28
|
||||
chardet==3.0.4
|
||||
Click==7.0
|
||||
clint==0.5.1
|
||||
configparser==4.0.2
|
||||
contextlib2==0.5.5
|
||||
defusedxml==0.6.0
|
||||
dj-database-url==0.5.0
|
||||
Django==1.11.27
|
||||
django-allauth==0.35.0
|
||||
|
@ -32,7 +32,6 @@ django-shortuuidfield==0.1.3
|
|||
djangorestframework==3.7.7
|
||||
dnspython==1.16.0
|
||||
docopt==0.6.2
|
||||
enum34==1.1.6
|
||||
ephem==3.7.7.0
|
||||
eventlet==0.25.1
|
||||
future==0.18.2
|
||||
|
@ -46,15 +45,14 @@ jsonpointer==2.0
|
|||
kombu==4.6.7
|
||||
Markdown==2.6.11
|
||||
monotonic==1.5
|
||||
more-itertools==5.0.0
|
||||
more-itertools==8.0.2
|
||||
mysqlclient==1.3.14
|
||||
oauthlib==3.1.0
|
||||
pathlib2==2.3.5
|
||||
Pillow==5.0.0
|
||||
PyJWT==1.7.1
|
||||
python-decouple==3.1
|
||||
python-dotenv==0.6.5
|
||||
python-openid==2.2.5
|
||||
python3-openid==3.1.0
|
||||
pytz==2019.3
|
||||
rcssmin==1.0.6
|
||||
redis==3.3.11
|
||||
|
@ -62,7 +60,6 @@ requests==2.22.0
|
|||
requests-oauthlib==1.3.0
|
||||
rjsmin==1.0.12
|
||||
satellitetle==0.8.1
|
||||
scandir==1.10.0
|
||||
schema==0.7.1
|
||||
sentry-sdk==0.7.14
|
||||
sgp4==1.4
|
||||
|
|
|
@ -29,7 +29,7 @@ install_requires =
|
|||
Django~=1.11.0
|
||||
django-shortuuidfield~=0.1.0
|
||||
django-jsonfield~=1.0.0
|
||||
celery~=4.1.0
|
||||
celery~=4.3.0
|
||||
internetarchive~=1.7.0
|
||||
# Deployment
|
||||
mysqlclient~=1.3.0
|
||||
|
|
Loading…
Reference in New Issue