Cpappas/use 2umain ecomworker (#4070)

* feat: use 2u/main version of ecomworker * chore: point ecommerce-worker version to 2u/main release tag * docs: add another note in base.in
openedx-unsupported · Dec 6, 2023 · e06c983 · e06c983
1 parent 4e4c227
commit e06c983
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/docs/decisions/0008-master-branch-split.rst b/docs/decisions/0008-master-branch-split.rst
@@ -9,7 +9,7 @@ Accepted
 Context
 -------
 
-Both 2U and the Open edX community use ecommerce's master branch for releases. Occasionally, changes
+Both 2U and the Open edX community used ecommerce's master branch for releases. Occasionally, changes
 specific to 2U's business case are merged into code, which also influences the structure
 of the code that the community runs, even if the changes are not relevant or beneficial
 to the community at large.

diff --git a/requirements/base.in b/requirements/base.in
@@ -30,7 +30,12 @@ edx-django-release-util
 edx-django-utils
 edx-drf-extensions>=8.13.0  # 8.13 fixes forgiven JWTs for ecommerce
 edx-django-sites-extensions
-edx-ecommerce-worker
+# edx-ecommerce-worker is pinned to releases from the 2u/main branch of its repo.
+# This OEP advises against this type of use of pinning: https://docs.openedx.org/projects/openedx-proposals/en/latest/best-practices/oep-0018-bp-python-dependencies.html#rationale
+# but it is a tradeoff we are willing to live with, given the infrequency
+# with which ecommerce-worker is actually updated and deployed.
+# See https://github.com/openedx/ecommerce/blob/master/docs/decisions/0008-master-branch-split.rst
+git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.4#egg=edx-ecommerce-worker
 edx-opaque-keys
 edx-rbac
 edx-rest-api-client

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -230,7 +230,7 @@ edx-drf-extensions==9.0.1
     # via
     #   -r requirements/base.in
     #   edx-rbac
-edx-ecommerce-worker==3.3.4
+edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.4
     # via -r requirements/base.in
 edx-opaque-keys==2.3.0
     # via

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -331,7 +331,7 @@ edx-drf-extensions==9.0.1
     # via
     #   -r requirements/test.txt
     #   edx-rbac
-edx-ecommerce-worker==3.3.4
+edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.4
     # via -r requirements/test.txt
 edx-i18n-tools==0.9.2
     # via -r requirements/test.txt

diff --git a/requirements/production.txt b/requirements/production.txt
@@ -235,7 +235,7 @@ edx-drf-extensions==9.0.1
     # via
     #   -r requirements/base.in
     #   edx-rbac
-edx-ecommerce-worker==3.3.4
+edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.4
     # via -r requirements/base.in
 edx-opaque-keys==2.3.0
     # via

diff --git a/requirements/test.txt b/requirements/test.txt
@@ -322,7 +322,7 @@ edx-drf-extensions==9.0.1
     # via
     #   -r requirements/base.txt
     #   edx-rbac
-edx-ecommerce-worker==3.3.4
+edx-ecommerce-worker @ git+https://github.com/openedx/ecommerce-worker.git@2u/3.3.4
     # via -r requirements/base.txt
 edx-i18n-tools==0.9.2
     # via -r requirements/test.in