Skip to content

fix: package incompatibility issues #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
taimoor-ahmed-1 wants to merge 20 commits into
base: develop-koa
Choose a base branch
from
Open

fix: package incompatibility issues #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5602e1f
fix: package incompatibility issues
Mar 7, 2025
80b6623
deps: Updated pip version to 20.3.4
muhammadali286 Mar 10, 2025
eb2e781
deps: updated tox-bettery version to 0.6.0
muhammadali286 Mar 10, 2025
29f6131
deps: update pip and tox-bettery version
muhammadali286 Mar 10, 2025
2cece2e
deps: update pip and tox-bettery version
muhammadali286 Mar 10, 2025
114da46
deps: update pip version
muhammadali286 Mar 10, 2025
cf1fb5f
deps: Updated tox to 4.x version
muhammadali286 Mar 11, 2025
02abbab
deps: update packaging version to 21.3
muhammadali286 Mar 11, 2025
4264beb
deps: update virtualenv version to 16.7.12
muhammadali286 Mar 11, 2025
1c40bcb
deps: update packaging version to 22.0
muhammadali286 Mar 11, 2025
0b23ea8
deps: update filelock version to 3.8.2
muhammadali286 Mar 11, 2025
6da4880
deps: update virtualenv version to 20.17.1
muhammadali286 Mar 11, 2025
80c843b
deps: update pluggy version to 1.0.0
muhammadali286 Mar 11, 2025
ab438ce
deps
muhammadali286 Mar 11, 2025
03cf19a
deps: updated requests version
muhammadali286 Mar 12, 2025
cd21ca9
deps:requests version to 2.26.0
muhammadali286 Mar 12, 2025
d50994d
deps: requests version to 2.28.1
muhammadali286 Mar 12, 2025
07dd07d
deps: requests version to 2.32.3
muhammadali286 Mar 12, 2025
833c25a
deps: requests version to 2.32.3
muhammadali286 Mar 12, 2025
c318abb
deps
muhammadali286 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ requirements: requirements.js
pip3 install -r requirements/dev.txt --exists-action w

requirements.tox:
pip3 install -U pip==20.0.2
pip3 install -U pip==20.3.4
pip3 install -r requirements/tox.txt --exists-action w

requirements.tox:
pip install -U pip==20.0.2
pip install -U pip==20.3.4
pip install -r requirements/tox.txt --exists-action w

production-requirements: requirements.js
Expand Down
16 changes: 8 additions & 8 deletions requirements/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,17 +39,17 @@ django-cors-headers==3.5.0 # via -r requirements/base.in
django-crispy-forms==1.8.1 # via -r requirements/base.in
django-crum==0.7.8 # via edx-django-utils, edx-rbac
django-extensions==3.0.9 # via -r requirements/base.in
django-extra-views==0.11.0 # via django-oscar
django-extra-views==0.13 # via django-oscar
django-filter==2.4.0 # via -r requirements/base.in
django-haystack==2.8.1 # via django-oscar
django-haystack==3.1.0 # via django-oscar
django-libsass==0.8 # via -r requirements/base.in
django-model-utils==4.0.0 # via edx-rbac
django-oscar==2.0.4 # via -c requirements/pins.txt, -r requirements/base.in
django-phonenumber-field==2.0.1 # via django-oscar
django-oscar==2.1.0 # via -c requirements/pins.txt, -r requirements/base.in
django-phonenumber-field==3.0.0 # via django-oscar
django-rest-swagger==2.2.0 # via -r requirements/base.in
django-simple-history==2.12.0 # via -r requirements/base.in
django-solo==1.1.3 # via -r requirements/base.in
django-tables2==1.21.2 # via django-oscar
django-tables2==2.2 # via django-oscar
django-threadlocals==0.10 # via -r requirements/base.in
django-treebeard==4.3.1 # via django-oscar
django-waffle==2.0.0 # via -r requirements/base.in, edx-django-utils, edx-drf-extensions
Expand All @@ -71,7 +71,7 @@ edx-rbac==1.3.3 # via -r requirements/base.in
edx-rest-api-client==5.2.1 # via -r requirements/base.in, edx-ecommerce-worker
enum34==1.1.10 # via cybersource-rest-client-python
extras==1.0.0 # via cybersource-rest-client-python, python-subunit, testtools
factory-boy==2.12.0 # via django-oscar
factory-boy==2.4.1 # via django-oscar
faker==4.14.1 # via factory-boy
fixtures==3.0.0 # via cybersource-rest-client-python, testtools
funcsigs==1.0.2 # via cybersource-rest-client-python
Expand All @@ -97,7 +97,7 @@ newrelic==5.22.1.152 # via -r requirements/base.in, edx-django-utils
nose==1.3.7 # via cybersource-rest-client-python
oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
openapi-codec==1.3.2 # via django-rest-swagger
packaging==20.4 # via bleach
packaging==22.0 # via bleach
paramiko==2.7.2 # via cybersource-rest-client-python
path.py==7.2 # via -r requirements/base.in
paypalrestsdk==1.13.1 # via -r requirements/base.in
Expand Down Expand Up @@ -133,7 +133,7 @@ redis==3.5.3 # via edx-ecommerce-worker
requests-file==1.5.1 # via zeep
requests-oauthlib==1.3.0 # via social-auth-core
requests-toolbelt==0.9.1 # via zeep
requests==2.24.0 # via -r requirements/base.in, analytics-python, coreapi, cybersource-rest-client-python, edx-drf-extensions, edx-rest-api-client, naked, paypalrestsdk, pyjwkest, requests-file, requests-oauthlib, requests-toolbelt, sailthru-client, slumber, social-auth-core, stripe, zeep
requests==2.32.3 # via -r requirements/base.in, analytics-python, coreapi, cybersource-rest-client-python, edx-drf-extensions, edx-rest-api-client, naked, paypalrestsdk, pyjwkest, requests-file, requests-oauthlib, requests-toolbelt, sailthru-client, slumber, social-auth-core, stripe, zeep
rest-condition==1.0.3 # via edx-drf-extensions
rjsmin==1.1.0 # via django-compressor
rsa==4.6 # via cybersource-rest-client-python
Expand Down
23 changes: 11 additions & 12 deletions requirements/dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ django-crispy-forms==1.8.1 # via -r requirements/test.txt
django-crum==0.7.8 # via -r requirements/test.txt, edx-django-utils, edx-rbac
django-debug-toolbar==3.1.1 # via -r requirements/dev.in
django-extensions==3.0.9 # via -r requirements/test.txt
django-extra-views==0.11.0 # via -r requirements/test.txt, django-oscar
django-extra-views==0.13 # via -r requirements/test.txt, django-oscar
django-filter==2.4.0 # via -r requirements/test.txt
django-haystack==2.8.1 # via -r requirements/test.txt, django-oscar
django-haystack==3.1.0 # via -r requirements/test.txt, django-oscar
django-libsass==0.8 # via -r requirements/test.txt
django-model-utils==4.0.0 # via -r requirements/test.txt, edx-rbac
django-oscar==2.0.4 # via -r requirements/test.txt
django-phonenumber-field==2.0.1 # via -r requirements/test.txt, django-oscar
django-oscar==2.1.0 # via -r requirements/test.txt
django-phonenumber-field==3.0.0 # via -r requirements/test.txt, django-oscar
django-rest-swagger==2.2.0 # via -r requirements/test.txt
django-simple-history==2.12.0 # via -r requirements/test.txt
django-solo==1.1.3 # via -r requirements/test.txt
django-tables2==1.21.2 # via -r requirements/test.txt, django-oscar
django-tables2==2.2 # via -r requirements/test.txt, django-oscar
django-threadlocals==0.10 # via -r requirements/test.txt
django-treebeard==4.3.1 # via -r requirements/test.txt, django-oscar
django-waffle==2.0.0 # via -r requirements/test.txt, edx-django-utils, edx-drf-extensions
Expand All @@ -82,9 +82,9 @@ edx-rest-api-client==5.2.1 # via -r requirements/test.txt, edx-ecommerce-worker
edx-sphinx-theme==1.0.2 # via -r requirements/docs.txt
enum34==1.1.10 # via -r requirements/test.txt, cybersource-rest-client-python
extras==1.0.0 # via -r requirements/test.txt, cybersource-rest-client-python, python-subunit, testtools
factory-boy==2.12.0 # via -r requirements/test.txt, django-oscar
factory-boy==2.4.1 # via -r requirements/test.txt, django-oscar
faker==4.14.1 # via -r requirements/test.txt, factory-boy
filelock==3.0.12 # via -r requirements/test.txt, tox
filelock==3.8.2 # via -r requirements/test.txt, tox
fixtures==3.0.0 # via -r requirements/test.txt, cybersource-rest-client-python, testtools
freezegun==1.0.0 # via -r requirements/test.txt
funcsigs==1.0.2 # via -r requirements/test.txt, cybersource-rest-client-python
Expand Down Expand Up @@ -123,14 +123,14 @@ newrelic==5.22.1.152 # via -r requirements/test.txt, edx-django-utils
nose==1.3.7 # via -r requirements/test.txt, cybersource-rest-client-python
oauthlib==3.1.0 # via -r requirements/test.txt, requests-oauthlib, social-auth-core
openapi-codec==1.3.2 # via -r requirements/test.txt, django-rest-swagger
packaging==20.4 # via -r requirements/test.txt, bleach, pytest, tox
packaging==22.0 # via -r requirements/test.txt, bleach, pytest, tox
paramiko==2.7.2 # via -r requirements/test.txt, cybersource-rest-client-python
path.py==7.2 # via -r requirements/test.txt, edx-i18n-tools
paypalrestsdk==1.13.1 # via -r requirements/test.txt
pbr==5.5.1 # via -r requirements/test.txt, cybersource-rest-client-python, fixtures, stevedore, testtools
phonenumbers==8.12.12 # via -r requirements/test.txt, django-oscar, django-phonenumber-field
pillow==8.0.1 # via -r requirements/test.txt, django-oscar
pluggy==0.13.1 # via -r requirements/test.txt, diff-cover, pytest, tox
pluggy==1.0.0 # via -r requirements/test.txt, diff-cover, pytest, tox
polib==1.1.0 # via -r requirements/test.txt, edx-i18n-tools
premailer==2.9.2 # via -r requirements/test.txt
psutil==5.7.3 # via -r requirements/test.txt, edx-django-utils
Expand Down Expand Up @@ -208,8 +208,7 @@ testfixtures==6.15.0 # via -r requirements/test.txt
testtools==2.4.0 # via -r requirements/test.txt, cybersource-rest-client-python, fixtures, python-subunit
text-unidecode==1.3 # via -r requirements/test.txt, faker, python-slugify
toml==0.10.2 # via -r requirements/test.txt, tox
tox-battery==0.5.2 # via -r requirements/test.txt
tox==3.14.6 # via -r requirements/test.txt, tox-battery
tox==4.0.18 # via -r requirements/test.txt
traceback2==1.4.0 # via -r requirements/test.txt, cybersource-rest-client-python, testtools, unittest2
transifex-client==0.14.1 # via -r requirements/dev.in
typing==3.7.4.3 # via -r requirements/test.txt, cybersource-rest-client-python
Expand All @@ -218,7 +217,7 @@ unittest2==1.1.0 # via -r requirements/test.txt, testtools
uritemplate==3.0.1 # via -r requirements/test.txt, coreapi
urllib3==1.25.11 # via -r requirements/docs.txt, -r requirements/test.txt, cybersource-rest-client-python, requests, responses, selenium, transifex-client
vine==1.3.0 # via -r requirements/test.txt, amqp, celery
virtualenv==16.7.9 # via -r requirements/test.txt, tox
virtualenv==20.17.1 # via -r requirements/test.txt, tox
waitress==1.4.4 # via -r requirements/test.txt, webtest
wcwidth==0.2.5 # via -r requirements/test.txt, pytest
webencodings==0.5.1 # via -r requirements/test.txt, bleach
Expand Down
2 changes: 1 addition & 1 deletion requirements/docs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jinja2==2.11.2 # via sphinx
markupsafe==1.1.1 # via jinja2
pygments==2.7.2 # via sphinx
pytz==2016.10 # via -c requirements/pins.txt, babel
requests==2.24.0 # via sphinx
requests==2.32.3 # via sphinx
six==1.15.0 # via edx-sphinx-theme, sphinx
snowballstemmer==2.0.0 # via sphinx
sphinx==1.5.3 # via -r requirements/docs.in, edx-sphinx-theme
Expand Down
6 changes: 3 additions & 3 deletions requirements/e2e.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ edx-rest-api-client==5.2.1 # via -c requirements/base.txt, -r requirements/e2e.
idna==2.7 # via -c requirements/base.txt, -c requirements/pins.txt, requests
more-itertools==8.6.0 # via pytest
newrelic==5.22.1.152 # via -c requirements/base.txt, edx-django-utils
packaging==20.4 # via -c requirements/base.txt, pytest
packaging==22.0 # via -c requirements/base.txt, pytest
pbr==5.5.1 # via -c requirements/base.txt, stevedore
pluggy==0.13.1 # via pytest
pluggy==1.0.0 # via pytest
psutil==5.7.3 # via -c requirements/base.txt, edx-django-utils
py==1.9.0 # via pytest
pycparser==2.20 # via -c requirements/base.txt, cffi
Expand All @@ -35,7 +35,7 @@ pytest-variables==1.9.0 # via pytest-selenium
pytest==5.3.5 # via -c requirements/pins.txt, -r requirements/e2e.in, pytest-base-url, pytest-html, pytest-metadata, pytest-randomly, pytest-selenium, pytest-timeout, pytest-variables
python-dotenv==0.15.0 # via -r requirements/e2e.in
pytz==2016.10 # via -c requirements/base.txt, -c requirements/pins.txt, django
requests==2.24.0 # via -c requirements/base.txt, edx-rest-api-client, pytest-base-url, pytest-selenium, slumber
requests==2.32.3 # via -c requirements/base.txt, edx-rest-api-client, pytest-base-url, pytest-selenium, slumber
selenium==3.141.0 # via -r requirements/e2e.in, pytest-selenium
six==1.15.0 # via -c requirements/base.txt, cryptography, packaging, tenacity
slumber==0.7.1 # via -c requirements/base.txt, edx-rest-api-client
Expand Down
5 changes: 2 additions & 3 deletions requirements/pins.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pytz==2016.10
urllib3>=1.24.2,<2.0.0

# Was causing some tox issues locally.
virtualenv==16.7.9
virtualenv==20.17.1

# newer version seems to be causing failures
# if tox -e py35-django22-pylint passes after
Expand All @@ -45,8 +45,7 @@ social-auth-core==3.2.0


# greater versions failing with extract-tranlsations step.
tox==3.14.6
tox-battery==0.5.2
tox==4.0.18

# cybersource-rest-client-python requires 2.7, but requests gives 2.10 by default
idna==2.7
Expand Down
16 changes: 8 additions & 8 deletions requirements/production.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ django-cors-headers==3.5.0 # via -r requirements/base.in
django-crispy-forms==1.8.1 # via -r requirements/base.in
django-crum==0.7.8 # via edx-django-utils, edx-rbac
django-extensions==3.0.9 # via -r requirements/base.in
django-extra-views==0.11.0 # via django-oscar
django-extra-views==0.13 # via django-oscar
django-filter==2.4.0 # via -r requirements/base.in
django-haystack==2.8.1 # via django-oscar
django-haystack==3.1.0 # via django-oscar
django-libsass==0.8 # via -r requirements/base.in
django-model-utils==4.0.0 # via edx-rbac
django-oscar==2.0.4 # via -c requirements/pins.txt, -r requirements/base.in
django-phonenumber-field==2.0.1 # via django-oscar
django-oscar==2.1.0 # via -c requirements/pins.txt, -r requirements/base.in
django-phonenumber-field==3.0.0 # via django-oscar
django-rest-swagger==2.2.0 # via -r requirements/base.in
django-ses==1.0.3 # via -r requirements/production.in
django-simple-history==2.12.0 # via -r requirements/base.in
django-solo==1.1.3 # via -r requirements/base.in
django-tables2==1.21.2 # via django-oscar
django-tables2==2.2 # via django-oscar
django-threadlocals==0.10 # via -r requirements/base.in
django-treebeard==4.3.1 # via django-oscar
django-waffle==2.0.0 # via -r requirements/base.in, edx-django-utils, edx-drf-extensions
Expand All @@ -74,7 +74,7 @@ edx-rbac==1.3.3 # via -r requirements/base.in
edx-rest-api-client==5.2.1 # via -r requirements/base.in, edx-ecommerce-worker
enum34==1.1.10 # via cybersource-rest-client-python
extras==1.0.0 # via cybersource-rest-client-python, python-subunit, testtools
factory-boy==2.12.0 # via django-oscar
factory-boy==2.4.1 # via django-oscar
faker==4.14.1 # via factory-boy
fixtures==3.0.0 # via cybersource-rest-client-python, testtools
funcsigs==1.0.2 # via cybersource-rest-client-python
Expand Down Expand Up @@ -103,7 +103,7 @@ nodeenv==1.1.1 # via -r requirements/production.in
nose==1.3.7 # via cybersource-rest-client-python
oauthlib==3.1.0 # via requests-oauthlib, social-auth-core
openapi-codec==1.3.2 # via django-rest-swagger
packaging==20.4 # via bleach
packaging==22.0 # via bleach
paramiko==2.7.2 # via cybersource-rest-client-python
path.py==7.2 # via -r requirements/base.in
paypalrestsdk==1.13.1 # via -r requirements/base.in
Expand Down Expand Up @@ -140,7 +140,7 @@ redis==3.5.3 # via -r requirements/production.in, edx-ecommerce-wor
requests-file==1.5.1 # via zeep
requests-oauthlib==1.3.0 # via social-auth-core
requests-toolbelt==0.9.1 # via zeep
requests==2.24.0 # via -r requirements/base.in, analytics-python, coreapi, cybersource-rest-client-python, edx-drf-extensions, edx-rest-api-client, naked, paypalrestsdk, pyjwkest, requests-file, requests-oauthlib, requests-toolbelt, sailthru-client, slumber, social-auth-core, stripe, zeep
requests==2.32.3 # via -r requirements/base.in, analytics-python, coreapi, cybersource-rest-client-python, edx-drf-extensions, edx-rest-api-client, naked, paypalrestsdk, pyjwkest, requests-file, requests-oauthlib, requests-toolbelt, sailthru-client, slumber, social-auth-core, stripe, zeep
rest-condition==1.0.3 # via edx-drf-extensions
rjsmin==1.1.0 # via django-compressor
rsa==4.6 # via cybersource-rest-client-python
Expand Down
Loading