diff --git a/debian/control b/debian/control index cb05aed428278dcdcfb124d6abc55c8fbf76e357..dcce1634fa34d8310cb856d5093a9a64a3340b15 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Package: uffd Architecture: any Depends: ${misc:Depends}, - ${python3:Depends}, +# ${python3:Depends}, python3-ldap3, python3-flask, python3-flask-sqlalchemy, diff --git a/requirements.txt b/requirements.txt index f5d043233c0ae3fcf6c5e0b77c044249f967ee0f..4716275e1bd7bf31353727b9ac2b5a93991fc43e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,39 +1,4 @@ -# Versions from Debian Buster -ldap3==2.4.1 -flask==1.0.2 -Flask-SQLAlchemy==2.1 -qrcode==6.1 -fido2==0.5.0 -Flask-OAuthlib==0.9.5 -Flask-Migrate==2.1.1 -Flask-Babel==0.11.2 -alembic==1.0.0 - -# The main dependencies on their own lead to version collisions and pip is -# not very good at resolving them, so we pin the versions from Debian Buster -# for all dependencies. -certifi==2018.8.24 -#cffi==1.12.2 -cffi # v1.12.2 no longer works with python3.9. Newer versions seem to work fine. -chardet==3.0.4 -click==7.0 -cryptography==2.6.1 -idna==2.6 -itsdangerous==0.24 -Jinja2==2.10 -MarkupSafe==1.1.0 -oauthlib==2.1.0 -pyasn1==0.4.2 -pycparser==2.19 -requests==2.21.0 -requests-oauthlib==1.0.0 -six==1.12.0 -SQLAlchemy==1.2.18 -urllib3==1.24.1 -Werkzeug==0.14.1 -python-dateutil==2.7.3 -#editor==1.0.3 -Mako==1.0.7 +. # Testing pytest==3.10.1 diff --git a/setup.py b/setup.py index 12287a2f31eb52ca6c333e7072b4145ac4d4d13d..b7b1370ce44214ba7f9ef710e842cda4ce85f259 100644 --- a/setup.py +++ b/setup.py @@ -28,4 +28,42 @@ setup( include_package_data=True, zip_safe=False, python_requires='>=3.7', + install_requires=[ + # Versions from Debian Buster + 'ldap3==2.4.1', + 'flask==1.0.2', + 'Flask-SQLAlchemy==2.1', + 'qrcode==6.1', + 'fido2==0.5.0', + 'Flask-OAuthlib==0.9.5', + 'Flask-Migrate==2.1.1', + 'Flask-Babel==0.11.2', + 'alembic==1.0.0', + + # The main dependencies on their own lead to version collisions and pip is + # not very good at resolving them, so we pin the versions from Debian Buster + # for all dependencies. + 'certifi==2018.8.24', + #cffi==1.12.2' + 'cffi # v1.12.2 no longer works with python3.9. Newer versions seem to work fine.', + 'chardet==3.0.4', + 'click==7.0', + 'cryptography==2.6.1', + 'idna==2.6', + 'itsdangerous==0.24', + 'Jinja2==2.10', + 'MarkupSafe==1.1.0', + 'oauthlib==2.1.0', + 'pyasn1==0.4.2', + 'pycparser==2.19', + 'requests==2.21.0', + 'requests-oauthlib==1.0.0', + 'six==1.12.0', + 'SQLAlchemy==1.2.18', + 'urllib3==1.24.1', + 'Werkzeug==0.14.1', + 'python-dateutil==2.7.3', + #editor==1.0.3 + 'Mako==1.0.7', + ], )