Skip to content

Commit

Permalink
Revert "Upgrade to Python 3.11, upgrade more deps"
Browse files Browse the repository at this point in the history
This reverts commit 8ab9ee2. The Flask
upgrade seems to have broken loginpass, so I'll need to debug this
later.
  • Loading branch information
mutantmonkey committed Apr 25, 2024
1 parent ad8087b commit a0d105a
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 14 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11
FROM python:3.9.6

RUN apt-get update && apt-get install -y \
git \
Expand All @@ -14,8 +14,8 @@ RUN apt-get update && apt-get install -y \
WORKDIR /usr/src/uwsgi

# prepare uwsgi
RUN wget -O uwsgi-2.0.25.1.tar.gz https://github.com/unbit/uwsgi/archive/refs/tags/2.0.25.1.tar.gz && \
tar --strip-components=1 -axvf uwsgi-2.0.25.1.tar.gz
RUN wget -O uwsgi-2.0.20.tar.gz https://github.com/unbit/uwsgi/archive/refs/tags/2.0.20.tar.gz && \
tar --strip-components=1 -axvf uwsgi-2.0.20.tar.gz
COPY uwsgi_profile.ini buildconf/wuvt.ini

# build and install uwsgi
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.11
FROM python:3.9.6

# WARNING: Do not use this Dockerfile for production installs. It creates a
# temporary database that is stored in the container, which you definitely
Expand All @@ -24,8 +24,8 @@ RUN apt-get update \
WORKDIR /usr/src/uwsgi

# prepare uwsgi
RUN wget -O uwsgi-2.0.25.1.tar.gz https://github.com/unbit/uwsgi/archive/refs/tags/2.0.25.1.tar.gz && \
tar --strip-components=1 -axvf uwsgi-2.0.25.1.tar.gz
RUN wget -O uwsgi-2.0.20.tar.gz https://github.com/unbit/uwsgi/archive/refs/tags/2.0.20.tar.gz && \
tar --strip-components=1 -axvf uwsgi-2.0.20.tar.gz
COPY uwsgi_profile.ini buildconf/wuvt.ini

# build and install uwsgi
Expand Down
2 changes: 1 addition & 1 deletion requirements.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Authlib
Authlib<13.0
bleach<5
boto3
click
Expand Down
22 changes: 15 additions & 7 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
# This file is autogenerated by pip-compile with python 3.9
# To update, run:
#
# pip-compile
#
alembic==1.13.1
# via flask-migrate
aniso8601==9.0.1
# via flask-restful
async-timeout==4.0.3
# via redis
authlib==1.3.0
# via
# -r requirements.in
Expand All @@ -18,9 +20,9 @@ blinker==1.7.0
# via
# flask
# sentry-sdk
boto3==1.34.91
boto3==1.34.85
# via -r requirements.in
botocore==1.34.91
botocore==1.34.85
# via
# boto3
# s3transfer
Expand Down Expand Up @@ -67,7 +69,7 @@ flask-wtf==1.2.1
# via -r requirements.in
google-api-core==2.18.0
# via google-api-python-client
google-api-python-client==2.127.0
google-api-python-client==2.126.0
# via -r requirements.in
google-auth==2.29.0
# via
Expand All @@ -88,6 +90,10 @@ humanize==4.9.0
# via -r requirements.in
idna==3.7
# via requests
importlib-metadata==7.1.0
# via
# flask
# markdown
itsdangerous==2.2.0
# via
# flask
Expand Down Expand Up @@ -154,7 +160,7 @@ pytz==2024.1
# via
# -r requirements.in
# flask-restful
redis==5.0.4
redis==5.0.3
# via
# -r requirements.in
# python-redis-lock
Expand Down Expand Up @@ -191,7 +197,7 @@ unidecode==1.3.8
# via -r requirements.in
uritemplate==4.1.1
# via google-api-python-client
urllib3==2.2.1
urllib3==1.26.18
# via
# botocore
# requests
Expand All @@ -204,3 +210,5 @@ werkzeug==3.0.2
# flask
wtforms==3.1.2
# via flask-wtf
zipp==3.18.1
# via importlib-metadata

0 comments on commit a0d105a

Please sign in to comment.