Revert "Update Django to 3.1 as well as other dependencies"

This reverts commit b3c9dca024.
This commit is contained in:
Raphael Michel
2021-03-12 10:52:02 +01:00
parent 7ae38b5e97
commit fdca62685c
3 changed files with 57 additions and 55 deletions

View File

@@ -1,9 +1,9 @@
django-debug-toolbar==3.2 django-debug-toolbar==2.1
# Testing requirements # Testing requirements
pycodestyle==2.6.* pycodestyle==2.5.*
pyflakes==2.2.* pyflakes==2.1.*
pep8-naming pep8-naming
flake8==3.8.* flake8==3.7.*
codecov codecov
coverage coverage
pytest-cov pytest-cov
@@ -11,12 +11,12 @@ pytest==6.*
pytest-django==4.* pytest-django==4.*
isort isort
pytest-rerunfailures==9.* pytest-rerunfailures==9.*
pytest-mock==3.5.* pytest-mock==2.0.*
responses responses
potypo potypo
freezegun freezegun
# Not really required, just nice to have # Not really required, just nice to have
pytest-xdist==2.2.* pytest-xdist==1.31.*
pytest-cache pytest-cache
pytest-sugar pytest-sugar

View File

@@ -1,19 +1,19 @@
# Functional requirements # Functional requirements
Django==3.1.* Django==3.0.*,>=3.0.9
djangorestframework==3.12.* djangorestframework==3.11.*
python-dateutil==2.8.* python-dateutil==2.8.*
isoweek isoweek
requests==2.25.0 requests==2.24.0
pytz pytz
django-bootstrap3==14.0.* django-bootstrap3==12.0.*
django-formset-js-improved==0.5.0.2 django-formset-js-improved==0.5.0.2
django-compressor==2.4.* django-compressor==2.4.*
django-hierarkey==1.0.*,>=1.0.4 django-hierarkey==1.0.*,>=1.0.4
django-filter==2.4.* django-filter==2.2.*
django-scopes==1.2.* django-scopes==1.2.*
reportlab>=3.5.65 reportlab>=3.5.18
PyPDF2==1.26.* PyPDF2==1.26.*
Pillow==8.* Pillow==7.*
django-libsass==0.8 django-libsass==0.8
libsass==0.20.* libsass==0.20.*
django-otp==0.7.*,>=0.7.5 django-otp==0.7.*,>=0.7.5
@@ -22,9 +22,9 @@ webauthn==0.4.*
django-formtools==2.2 django-formtools==2.2
celery==4.4.* celery==4.4.*
kombu==4.6.* kombu==4.6.*
django-statici18n==2.0.* django-statici18n==1.9.*
inlinestyler==0.2.* inlinestyler==0.2.*
BeautifulSoup4==4.9.* BeautifulSoup4==4.8.*
slimit slimit
lxml lxml
static3==0.7.* static3==0.7.*
@@ -35,38 +35,39 @@ markdown==3.3.*
bleach==3.3.* bleach==3.3.*
sentry-sdk==0.14.* sentry-sdk==0.14.*
babel babel
django-i18nfield==1.9.* django-i18nfield>=1.7.0
django-hijack==2.3.* django-hijack>=2.1.10,<2.2.0
jsonschema jsonschema
openpyxl==3.0.* openpyxl==3.0.*
django-oauth-toolkit==1.4.* django-oauth-toolkit==1.2.*
oauthlib==3.1.* oauthlib==3.1.*
django-jsonfallback>=2.1.2 django-jsonfallback>=2.1.2
psycopg2-binary psycopg2-binary
tqdm==4.* tqdm==4.*
# Stripe # Stripe
stripe==2.56.* stripe==2.42.*
# PayPal # PayPal
paypalrestsdk==1.13.* paypalrestsdk==1.13.*
pycparser==2.13 # https://github.com/eliben/pycparser/issues/147
# Banktransfer # Banktransfer
chardet==4.0.* chardet<3.1.0,>=3.0.2
mt-940==3.2 mt-940==3.2
vobject==0.9.* vobject==0.9.*
pycountry pycountry
django-countries==7.* django-countries>=6.0
pyuca # for better sorting of country names in django-countries pyuca # for better sorting of country names in django-countries
defusedcsv>=1.1.0 defusedcsv>=1.1.0
vat_moss_forked==2020.3.20.0.11.0 vat_moss_forked==2020.3.20.0.11.0
django-localflavor==3.0.* django-localflavor>=2.2
django-redis==4.12.* django-redis==4.11.*
redis==3.5.* redis==3.4.*
django-phonenumber-field==5.0.* django-phonenumber-field==4.0.*
phonenumberslite==8.12.* phonenumberslite==8.11.*
python-bidi==0.4.* # Support for arabic in reportlab python-bidi==0.4.* # Support for arabic in reportlab
arabic-reshaper==2.0.15 # Support for Aabic in reportlab arabic-reshaper==2.0.15 # Support for Aabic in reportlab
packaging packaging
tlds>=2021031000 tlds>=2020041600
text-unidecode==1.* text-unidecode==1.*
protobuf==3.15.* protobuf==3.13.*
cryptography>=3.4.2 cryptography>=3.4.2
sepaxml==2.4.*,>=2.4.1 sepaxml==2.4.*,>=2.4.1

View File

@@ -88,19 +88,19 @@ setup(
keywords='tickets web shop ecommerce', keywords='tickets web shop ecommerce',
install_requires=[ install_requires=[
'Django==3.1.*', 'Django==3.0.*,>=3.0.9',
'djangorestframework==3.12.*', 'djangorestframework==3.11.*',
'python-dateutil==2.8.*', 'python-dateutil==2.8.*',
'isoweek', 'isoweek',
'requests==2.25.*', 'requests==2.24.*',
'pytz', 'pytz',
'django-bootstrap3==14.0.*', 'django-bootstrap3==12.0.*',
'django-formset-js-improved==0.5.0.2', 'django-formset-js-improved==0.5.0.2',
'django-compressor==2.4.*', 'django-compressor==2.4.*',
'django-hierarkey==1.0.*,>=1.0.4', 'django-hierarkey==1.0.*,>=1.0.4',
'django-filter==2.4.*', 'django-filter==2.2.*',
'django-scopes==1.2.*', 'django-scopes==1.2.*',
'reportlab>=3.5.65', 'reportlab>=3.5.18',
'Pillow==7.*', 'Pillow==7.*',
'PyPDF2==1.26.*', 'PyPDF2==1.26.*',
'django-libsass==0.8', 'django-libsass==0.8',
@@ -111,9 +111,9 @@ setup(
'django-formtools==2.2', 'django-formtools==2.2',
'celery==4.4.*', 'celery==4.4.*',
'kombu==4.6.*', 'kombu==4.6.*',
'django-statici18n==2.0.*', 'django-statici18n==1.9.*',
'inlinestyler==0.2.*', 'inlinestyler==0.2.*',
'BeautifulSoup4==4.9.*', 'BeautifulSoup4==4.8.*',
'slimit', 'slimit',
'lxml', 'lxml',
'static3==0.7.*', 'static3==0.7.*',
@@ -125,52 +125,53 @@ setup(
'sentry-sdk==0.14.*', 'sentry-sdk==0.14.*',
'babel', 'babel',
'paypalrestsdk==1.13.*', 'paypalrestsdk==1.13.*',
'django-redis==4.12.*', 'pycparser==2.13',
'redis==3.5.*', 'django-redis==4.11.*',
'stripe==2.56.*', 'redis==3.4.*',
'chardet==4.0.*', 'stripe==2.42.*',
'chardet<3.1.0,>=3.0.2',
'mt-940==3.2', 'mt-940==3.2',
'django-i18nfield==1.9.*', 'django-i18nfield>=1.7.0',
'django-jsonfallback>=2.1.2', 'django-jsonfallback>=2.1.2',
'psycopg2-binary', 'psycopg2-binary',
'tqdm==4.*', 'tqdm==4.*',
'vobject==0.9.*', 'vobject==0.9.*',
'pycountry', 'pycountry',
'django-countries==7.*', 'django-countries>=6.0',
'pyuca', 'pyuca',
'defusedcsv>=1.1.0', 'defusedcsv>=1.1.0',
'vat_moss_forked==2020.3.20.0.11.0', 'vat_moss_forked==2020.3.20.0.11.0',
'django-localflavor==3.0.*', 'django-localflavor>=2.2',
'jsonschema', 'jsonschema',
'django-hijack==2.3.*', 'django-hijack>=2.1.10,<2.2.0',
'openpyxl==3.0.*', 'openpyxl==3.0.*',
'django-oauth-toolkit==1.4.*', 'django-oauth-toolkit==1.2.*',
'oauthlib==3.1.*', 'oauthlib==3.1.*',
'django-phonenumber-field==5.0.*', 'django-phonenumber-field==4.0.*',
'phonenumberslite==8.12.*', 'phonenumberslite==8.11.*',
'python-bidi==0.4.*', # Support for Arabic in reportlab 'python-bidi==0.4.*', # Support for Arabic in reportlab
'arabic-reshaper==2.0.15', # Support for Arabic in reportlab 'arabic-reshaper==2.0.15', # Support for Arabic in reportlab
'packaging', 'packaging',
'tlds>=2021031000', 'tlds>=2020041600',
'text-unidecode==1.*', 'text-unidecode==1.*',
'protobuf==3.15.*', 'protobuf==3.13.*',
'cryptography>=3.4.2', 'cryptography>=3.4.2',
'sepaxml==2.4.*,>=2.4.1', 'sepaxml==2.4.*,>=2.4.1',
], ],
extras_require={ extras_require={
'dev': [ 'dev': [
'django-debug-toolbar==3.2', 'django-debug-toolbar==2.1',
'pycodestyle==2.6.*', 'pycodestyle==2.5.*',
'pyflakes==2.2.*', 'pyflakes==2.1.*',
'flake8==3.8.*', 'flake8==3.7.*',
'pep8-naming', 'pep8-naming',
'coveralls', 'coveralls',
'coverage', 'coverage',
'pytest==6.*', 'pytest==6.*',
'pytest-django==4.*', 'pytest-django==4.*',
'pytest-xdist==2.2.*', 'pytest-xdist==1.31.*',
'isort', 'isort',
'pytest-mock==3.5.*', 'pytest-mock==2.0.*',
'pytest-rerunfailures==9.*', 'pytest-rerunfailures==9.*',
'responses', 'responses',
'potypo', 'potypo',