Skip to content

Commit

Permalink
Merge pull request #383 from Kegbot/mikey/py2to3
Browse files Browse the repository at this point in the history
Upgrade to Python 3
  • Loading branch information
mik3y authored Feb 23, 2020
2 parents ec7d30f + a2b9b78 commit 683689c
Show file tree
Hide file tree
Showing 73 changed files with 967 additions and 703 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
language: python

python:
- "2.7"
- "3.7"
- "3.8"

services:
- mysql
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:2.7-alpine
FROM python:3-alpine

RUN mkdir /app
WORKDIR /app
Expand Down
72 changes: 23 additions & 49 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,72 +7,46 @@ verify_ssl = true
kegbot = {editable = true,path = "."}

[packages]
amqp = "==2.1.4"
billiard = "==3.5.0.2"
celery = "==4.0.2"
certifi = "==2017.4.17"
chardet = "==3.0.4"
colorama = "==0.3.9"
coloredlogs = "==7.3.1"
configparser = "==3.5.0"
contextlib2 = "==0.5.5"
celery = "*"
coloredlogs = "*"
dj-database-url = "==0.4.2"
django-appconf = "==1.0.2"
django-bootstrap-pagination = "==1.6.2"
django-crispy-forms = "==1.6.1"
django-imagekit = "==4.0.1"
django-nose = "==1.4.4"
django-redis = "==4.8.0"
django-registration = "==2.2"
enum34 = "==1.1.6"
flake8 = "==3.3.0"
flake8 = "*"
foursquare = "==1!2016.9.12"
funcsigs = "==1.0.2"
gunicorn = "==19.7.1"
httplib2 = "==0.10.3"
humanfriendly = "==4.4.1"
idna = "==2.5"
isodate = "==0.5.4"
gunicorn = "*"
httplib2 = "*"
isodate = "*"
jsonfield = "==2.0.2"
kegbot-api = "==1.1.0"
kegbot-pyutils = "==0.1.8"
kombu = "==4.0.2"
mccabe = "==0.6.1"
mock = "==2.0.0"
monotonic = "==1.4"
nose = "==1.3.7"
oauthlib = "==2.0.2"
olefile = "==0.44"
pbr = "==3.1.1"
pilkit = "==2.0"
protobuf = "==3.3.0"
pycodestyle = "==2.3.1"
pyflakes = "==1.5.0"
python-gflags = "==3.1.1"
pytz = "==2017.2"
redis = "==2.10.5"
rednose = "==1.2.2"
requests-mock = "==1.3.0"
requests-oauthlib = "==0.8.0"
requests = "==2.18.1"
six = "==1.10.0"
termstyle = "==0.1.11"
tweepy = "==3.5.0"
urllib3 = "==1.21.1"
vcrpy = "==1.11.1"
vine = "==1.1.3"
oauthlib = "*"
pilkit = "*"
protobuf = "*"
python-gflags = "*"
pytz = "*"
redis = "*"
requests-mock = "*"
requests-oauthlib = "*"
requests = "*"
tweepy = "*"
vcrpy = "*"
whitenoise = "==3.3.0"
wrapt = "==1.10.10"
Django = "==1.11.28"
Pillow = "==4.1.1"
PyYAML = "==3.12"
Pillow = "*"
PyYAML = "*"
mysqlclient = "*"
sphinx = "*"
pytest = "*"
pytest-django = "*"
future = "*"
addict = "*"
kegbot-api = "*"

[scripts]
kegbot = "python bin/kegbot"

[requires]
python_version = "2.7"
python_version = "3"
Loading

0 comments on commit 683689c

Please sign in to comment.