chore: Syncing 2u/project-theseus with master [2023-08-28]

.coveragerc

@@ -1,3 +1,3 @@
 [run]
 data_file = .coverage
-omit = ecommerce_worker/configuration*
+omit = ecommerce_worker/configuration/*

.github/workflows/add-depr-ticket-to-depr-board.yml

@@ -16,4 +16,4 @@ jobs:
     secrets:
       GITHUB_APP_ID: ${{ secrets.GRAPHQL_AUTH_APP_ID }}
       GITHUB_APP_PRIVATE_KEY: ${{ secrets.GRAPHQL_AUTH_APP_PEM }}
-      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}
+      SLACK_BOT_TOKEN: ${{ secrets.SLACK_ISSUE_BOT_TOKEN }}

.github/workflows/add-remove-label-on-comment.yml

@@ -0,0 +1,20 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "label: " it tries to apply
+# the label indicated in rest of comment.
+# If the comment starts with "remove label: ", it tries
+# to remove the indicated label.
+# Note: Labels are allowed to have spaces and this script does
+# not parse spaces (as often a space is legitimate), so the command
+# "label: really long lots of words label" will apply the
+# label "really long lots of words label"
+
+name: Allows for the adding and removing of labels via comment
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  add_remove_labels:
+    uses: openedx/.github/.github/workflows/add-remove-label-on-comment.yml@master
+

.github/workflows/pypi-publish.yml

@@ -24,7 +24,7 @@ jobs:
         run: python setup.py sdist bdist_wheel
 
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@master
+        uses: pypa/gh-action-pypi-publish@release/v1
         with:
           user: __token__
           password: ${{ secrets.PYPI_UPLOAD_TOKEN }}

.github/workflows/self-assign-issue.yml

@@ -0,0 +1,12 @@
+# This workflow runs when a comment is made on the ticket
+# If the comment starts with "assign me" it assigns the author to the
+# ticket (case insensitive)
+
+name: Assign comment author to ticket if they say "assign me"
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  self_assign_by_comment:
+    uses: openedx/.github/.github/workflows/self-assign-issue.yml@master

CODEOWNERS

@@ -0,0 +1,5 @@
+# Team @openedx/revenue-squad will be the default owners for
+# everything in this repo. Unless a later match takes
+# precedence, @openedx/revenue-squad will be requested for
+# review when someone opens a pull request.
+* @openedx/revenue-squad

README.rst

@@ -1,4 +1,4 @@
-DEPRECATION WARNING 
+DEPRECATION WARNING
 ====================
 This repository is deprecated and in maintainence-only operation while we work on a replacement, please see `this announcement <https://discuss.openedx.org/t/deprecation-removal-ecommerce-service-depr-22/6839>`__ for more information.
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -70,7 +70,7 @@ How To Contribute
 
 Anyone merging to this repository is expected to `release and monitor their changes <https://openedx.atlassian.net/wiki/spaces/RS/pages/1835106870/How+to+contribute+to+our+repositories>`__; if you are not able to do this DO NOT MERGE, please coordinate with someone who can to ensure that the changes are released.
 
-Please also read `How To Contribute <https://github.com/openedx/edx-platform/blob/master/CONTRIBUTING.rst>`__. Even though it was written with ``edx-platform`` in mind, these guidelines should be followed for Open edX code in general.
+Please also read `How To Contribute <https://github.com/openedx/.github/blob/master/CONTRIBUTING.md>`__.
 
 Reporting Security Issues
 -------------------------

ecommerce_worker/__init__.py

@@ -1,3 +1,3 @@
 """init"""
 
-__version__ = '3.3.2'
+__version__ = '3.3.4'

ecommerce_worker/configuration/production.py

@@ -15,7 +15,7 @@
 
 filename = get_overrides_filename('ECOMMERCE_WORKER_CFG')
 with open(filename) as f:
-    config_from_yaml = yaml.load(f)
+    config_from_yaml = yaml.safe_load(f)
 
 # Override base configuration with values from disk.
 vars().update(config_from_yaml)

ecommerce_worker/email/v1/utils.py

@@ -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()

ecommerce_worker/fulfillment/v1/tasks.py

@@ -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()
 

requirements/base.txt

@@ -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

requirements/common_constraints.txt

@@ -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

requirements/constraints.txt

@@ -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

requirements/optional.txt

@@ -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

requirements/pip.txt

@@ -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

requirements/pip_tools.txt

@@ -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: