Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
chore: updated Python requirements (REV-2693) (#198)
Browse files Browse the repository at this point in the history
  • Loading branch information
ishahroz authored May 12, 2023
1 parent fc1bfaf commit 3c37f1e
Show file tree
Hide file tree
Showing 13 changed files with 226 additions and 168 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[run]
data_file = .coverage
omit = ecommerce_worker/configuration*
omit = ecommerce_worker/configuration/*
2 changes: 1 addition & 1 deletion ecommerce_worker/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""init"""

__version__ = '3.3.2'
__version__ = '3.3.3'
3 changes: 2 additions & 1 deletion ecommerce_worker/email/v1/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ def update_assignment_email_status(offer_assignment_id, send_id, status, site_co
response = requests.post(
api_url,
data=post_data,
headers=headers
headers=headers,
timeout=10
)
response.raise_for_status()
data = response.json()
Expand Down
3 changes: 2 additions & 1 deletion ecommerce_worker/fulfillment/v1/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ def fulfill_order(self, order_number, site_code=None, email_opt_in=False):
response = requests.put(
api_url,
params=params,
headers=headers
headers=headers,
timeout=10
)
response.raise_for_status()

Expand Down
57 changes: 34 additions & 23 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,69 +1,80 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
amqp==2.6.1
# via kombu
asgiref==3.4.1
asgiref==3.6.0
# via django
async-timeout==4.0.2
# via redis
billiard==3.6.4.0
# via celery
celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/base.in
certifi==2021.5.30
certifi==2022.12.7
# via requests
charset-normalizer==2.0.6
cffi==1.15.1
# via pynacl
charset-normalizer==3.1.0
# via requests
django-crum==0.7.9
# via edx-django-utils
django-waffle==2.2.1
click==8.1.3
# via edx-django-utils
django==3.2.8
django==3.2.18
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# django-crum
# edx-django-utils
edx-braze-client==0.1.4
django-crum==0.7.9
# via edx-django-utils
django-waffle==3.0.0
# via edx-django-utils
edx-braze-client==0.1.6
# via -r requirements/base.in
edx-django-utils==4.4.0
edx-django-utils==5.4.0
# via edx-rest-api-client
edx-rest-api-client==5.4.0
edx-rest-api-client==5.5.0
# via -r requirements/base.in
idna==3.2
idna==3.4
# via requests
kombu==4.6.11
# via celery
newrelic==7.0.0.166
newrelic==8.8.0
# via edx-django-utils
pbr==5.6.0
pbr==5.11.1
# via stevedore
psutil==5.8.0
psutil==5.9.5
# via edx-django-utils
pyjwt==2.2.0
pycparser==2.21
# via cffi
pyjwt==2.6.0
# via edx-rest-api-client
pytz==2021.3
pynacl==1.5.0
# via edx-django-utils
pytz==2023.3
# via
# celery
# django
redis==3.5.3
redis==4.5.4
# via -r requirements/base.in
requests==2.26.0
requests==2.28.2
# via
# edx-rest-api-client
# slumber
six==1.16.0
# via -r requirements/base.in
slumber==0.7.1
# via edx-rest-api-client
sqlparse==0.4.2
sqlparse==0.4.4
# via django
stevedore==3.4.0
stevedore==5.0.0
# via edx-django-utils
urllib3==1.26.7
urllib3==1.26.15
# via requests
vine==1.3.0
# via
Expand Down
11 changes: 9 additions & 2 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ Django<4.0
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

setuptools<60

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
10 changes: 6 additions & 4 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
# These were previously pinned in ecommerce-worker, and will stay that way
# until we go through the process of relaxing them gradually.

# breaking changes in CLI and dropped support for python3.5 in celery 5.0
celery<5.0


# some other package are bringing django3.0 so adding constraint.
Django<3.3

# This file contains all common constraints for edx-repos
-c common_constraints.txt

# breaking changes in CLI and dropped support for python3.5 in celery 5.0
celery<5.0
6 changes: 3 additions & 3 deletions requirements/optional.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
newrelic==7.0.0.166
newrelic==8.8.0
# via -r requirements/optional.in
14 changes: 6 additions & 8 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.37.1
wheel==0.40.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==22.1.2
pip==23.1.2
# via -r requirements/pip.in
setuptools==67.7.2
# via -r requirements/pip.in
setuptools==59.8.0
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
20 changes: 12 additions & 8 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
click==8.0.1
build==0.10.0
# via pip-tools
pep517==0.11.0
click==8.1.3
# via pip-tools
pip-tools==6.3.0
packaging==23.1
# via build
pip-tools==6.13.0
# via -r requirements/pip_tools.in
tomli==1.2.1
# via pep517
wheel==0.37.0
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via build
wheel==0.40.0
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
71 changes: 46 additions & 25 deletions requirements/production.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
#
# This file is autogenerated by pip-compile
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
amqp==2.6.1
# via
# -r requirements/base.txt
# kombu
asgiref==3.4.1
asgiref==3.6.0
# via
# -r requirements/base.txt
# django
async-timeout==4.0.2
# via
# -r requirements/base.txt
# redis
billiard==3.6.4.0
# via
# -r requirements/base.txt
Expand All @@ -20,70 +24,87 @@ celery==4.4.7
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
certifi==2021.5.30
certifi==2022.12.7
# via
# -r requirements/base.txt
# requests
charset-normalizer==2.0.6
cffi==1.15.1
# via
# -r requirements/base.txt
# requests
django-crum==0.7.9
# pynacl
charset-normalizer==3.1.0
# via
# -r requirements/base.txt
# edx-django-utils
django-waffle==2.2.1
# requests
click==8.1.3
# via
# -r requirements/base.txt
# edx-django-utils
django==3.2.8
django==3.2.18
# via
# -c requirements/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/base.txt
# django-crum
# edx-django-utils
edx-braze-client==0.1.4
django-crum==0.7.9
# via
# -r requirements/base.txt
# edx-django-utils
django-waffle==3.0.0
# via
# -r requirements/base.txt
# edx-django-utils
edx-braze-client==0.1.6
# via -r requirements/base.txt
edx-django-utils==4.4.0
edx-django-utils==5.4.0
# via
# -r requirements/base.txt
# edx-rest-api-client
edx-rest-api-client==5.4.0
edx-rest-api-client==5.5.0
# via -r requirements/base.txt
idna==3.2
idna==3.4
# via
# -r requirements/base.txt
# requests
kombu==4.6.11
# via
# -r requirements/base.txt
# celery
newrelic==7.0.0.166
newrelic==8.8.0
# via
# -r requirements/base.txt
# edx-django-utils
pbr==5.6.0
pbr==5.11.1
# via
# -r requirements/base.txt
# stevedore
psutil==5.8.0
psutil==5.9.5
# via
# -r requirements/base.txt
# edx-django-utils
pyjwt==2.2.0
pycparser==2.21
# via
# -r requirements/base.txt
# cffi
pyjwt==2.6.0
# via
# -r requirements/base.txt
# edx-rest-api-client
pytz==2021.3
pynacl==1.5.0
# via
# -r requirements/base.txt
# edx-django-utils
pytz==2023.3
# via
# -r requirements/base.txt
# celery
# django
pyyaml==5.4.1
pyyaml==6.0
# via -r requirements/production.in
redis==3.5.3
redis==4.5.4
# via -r requirements/base.txt
requests==2.26.0
requests==2.28.2
# via
# -r requirements/base.txt
# edx-rest-api-client
Expand All @@ -94,15 +115,15 @@ slumber==0.7.1
# via
# -r requirements/base.txt
# edx-rest-api-client
sqlparse==0.4.2
sqlparse==0.4.4
# via
# -r requirements/base.txt
# django
stevedore==3.4.0
stevedore==5.0.0
# via
# -r requirements/base.txt
# edx-django-utils
urllib3==1.26.7
urllib3==1.26.15
# via
# -r requirements/base.txt
# requests
Expand Down
Loading

0 comments on commit 3c37f1e

Please sign in to comment.