From faef60bfe0a3db79e66e3ff7c8366ef9cfee3948 Mon Sep 17 00:00:00 2001 From: Muhammad Faraz Maqsood Date: Mon, 11 Nov 2024 15:21:26 +0500 Subject: [PATCH] v19.0.0 - upgrade to sumac - add a deprecation warning in the readme as ecommerce and ecommerce-worker repositories have been archieved now. - dockerfile now includes link to archieved repositories of ecommerce and ecommerce-worker. --- CHANGELOG.md | 10 ++++++++++ README.rst | 10 +++++----- changelog.d/20240621_170044_regis.md | 1 - changelog.d/20240621_175315_regis_nightly.md | 1 - setup.py | 8 ++++---- tutorecommerce/__about__.py | 2 +- .../ecommerce/build/ecommerce-worker/Dockerfile | 2 +- .../templates/ecommerce/build/ecommerce/Dockerfile | 6 +++--- 8 files changed, 24 insertions(+), 16 deletions(-) delete mode 100644 changelog.d/20240621_170044_regis.md delete mode 100644 changelog.d/20240621_175315_regis_nightly.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a4d68e6..fec7d7e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,16 @@ instructions, because git commits are used to generate release notes: + +## v19.0.0 (2024-10-24) + +- 💥[Feature] Upgrade to Sumac. (by @Faraz32123) + - tutor-ecommerce will be deprecated with this release as the underlying e-commerce repositories have been archived. For more details, please refer to the deprecation ticket .i.e. https://github.com/overhangio/tutor-ecommerce/issues/83. +- [BugFix] Updating the uwsgi version to the latest fixes `uwsgi: error while loading shared libraries: libpython3.12.so.1.0: cannot open shared object file: No such file or directory`. (by @Faraz32123) +- [Bugfix] Fix ecommerce image build, which was failing because of a missing pkg-config apt package. (by @regisb) +- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) + + ## v18.0.0 (2024-05-15) diff --git a/README.rst b/README.rst index cb67b62e..3ebfcc8f 100644 --- a/README.rst +++ b/README.rst @@ -1,13 +1,13 @@ +⛔️ WARNING +========== + +This plugin is deprecated as the underlying e-commerce repositories have been archived. For more details, please refer to the deprecation ticket: [tutor-ecommerce deprecation ticket](https://github.com/overhangio/tutor-ecommerce/issues/83). + E-Commerce plugin for `Tutor `_ =============================================================== This is a plugin for `Tutor `_ that integrates the `E-Commerce `__ application in an Open edX platform. -⛔️ WARNING -========== - -e-commerce and e-commerce worker are under-maintained. The Open edX community is not fixing bugs or developing new features for it. We hope to deprecate and replace it soon. For updates, `follow along on the DEPR ticket `_. - Installation ------------ diff --git a/changelog.d/20240621_170044_regis.md b/changelog.d/20240621_170044_regis.md deleted file mode 100644 index d7d2eb72..00000000 --- a/changelog.d/20240621_170044_regis.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix legacy warnings during Docker build. (by @regisb) diff --git a/changelog.d/20240621_175315_regis_nightly.md b/changelog.d/20240621_175315_regis_nightly.md deleted file mode 100644 index e977836a..00000000 --- a/changelog.d/20240621_175315_regis_nightly.md +++ /dev/null @@ -1 +0,0 @@ -- [Bugfix] Fix ecommerce image build, which was failing because of a missing pkg-config apt package. (by @regisb) diff --git a/setup.py b/setup.py index 21ca6ec5..07d573bf 100644 --- a/setup.py +++ b/setup.py @@ -35,11 +35,11 @@ include_package_data=True, python_requires=">=3.9", install_requires=[ - "tutor>=18.0.0,<19.0.0", - "tutor-discovery>=18.0.0,<19.0.0", - "tutor-mfe>=18.0.0,<19.0.0", + "tutor>=19.0.0,<20.0.0", + "tutor-discovery>=19.0.0,<20.0.0", + "tutor-mfe>=19.0.0,<20.0.0", ], - extras_require={"dev": ["tutor[dev]>=18.0.0,<19.0.0"]}, + extras_require={"dev": ["tutor[dev]>=19.0.0,<20.0.0"]}, entry_points={"tutor.plugin.v1": ["ecommerce = tutorecommerce.plugin"]}, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tutorecommerce/__about__.py b/tutorecommerce/__about__.py index c6a8b8ed..0122a6fa 100644 --- a/tutorecommerce/__about__.py +++ b/tutorecommerce/__about__.py @@ -1 +1 @@ -__version__ = "18.0.0" +__version__ = "19.0.0" diff --git a/tutorecommerce/templates/ecommerce/build/ecommerce-worker/Dockerfile b/tutorecommerce/templates/ecommerce/build/ecommerce-worker/Dockerfile index 41a51542..7eb0b5ed 100644 --- a/tutorecommerce/templates/ecommerce/build/ecommerce-worker/Dockerfile +++ b/tutorecommerce/templates/ecommerce/build/ecommerce-worker/Dockerfile @@ -13,7 +13,7 @@ RUN useradd --home-dir /openedx --create-home --shell /bin/bash --uid ${APP_USER USER ${APP_USER_ID} RUN mkdir /openedx/ecommerce_worker && \ - git clone https://github.com/openedx/ecommerce-worker.git --branch {{ OPENEDX_COMMON_VERSION }} --depth 1 /openedx/ecommerce_worker + git clone https://github.com/openedx-unsupported/ecommerce-worker.git --branch open-release/sumac.master --depth 1 /openedx/ecommerce_worker WORKDIR /openedx/ecommerce_worker # Install pyenv diff --git a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile index 7304ff7c..7a870dcb 100644 --- a/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile +++ b/tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile @@ -11,8 +11,8 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ ###### Checkout code FROM minimal AS checkout -ARG ECOMMERCE_REPOSITORY=https://github.com/openedx/ecommerce.git -ARG ECOMMERCE_VERSION='{{ OPENEDX_COMMON_VERSION }}' +ARG ECOMMERCE_REPOSITORY=https://github.com/openedx-unsupported/ecommerce.git +ARG ECOMMERCE_VERSION='open-release/sumac.master' RUN mkdir -p /openedx/ecommerce && \ git clone $ECOMMERCE_REPOSITORY --branch $ECOMMERCE_VERSION --depth 1 /openedx/ecommerce @@ -82,7 +82,7 @@ RUN --mount=type=cache,target=/openedx/.cache/bower,sharing=shared,uid=${APP_USE # python requirements RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared,uid=${APP_USER_ID} pip install -r requirements.txt # https://pypi.org/project/uWSGI/ -RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared,uid=${APP_USER_ID} pip install uwsgi==2.0.24 +RUN --mount=type=cache,target=/openedx/.cache/pip,sharing=shared,uid=${APP_USER_ID} pip install uwsgi==2.0.27 # Install private requirements: this is useful for installing custom payment processors. COPY --chown=app:app ./requirements/ /openedx/requirements