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

Commit

Permalink
feat: upgrade to sumac
Browse files Browse the repository at this point in the history
  • Loading branch information
regisb authored Dec 16, 2024
2 parents 91cbe78 + 28a74cd commit 3d0c195
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 19 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,13 @@ instructions, because git commits are used to generate release notes:

<!-- scriv-insert-here -->

<a id='changelog-19.0.0'></a>
## v19.0.0 (2024-12-16)

- 💥[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)

<a id='changelog-18.0.1'></a>
## v18.0.1 (2024-12-12)

Expand Down
20 changes: 10 additions & 10 deletions README.rst
Original file line number Diff line number Diff line change
@@ -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 `tutor-ecommerce DEPR ticket <https://github.com/overhangio/tutor-ecommerce/issues/83>`_ and `upstream Open edX DEPR ticket <https://github.com/openedx/public-engineering/issues/22>`_.

E-Commerce plugin for `Tutor <https://docs.tutor.edly.io>`_
===============================================================

This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ that integrates the `E-Commerce <https://github.com/openedx/ecommerce/>`__ 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 <https://github.com/openedx/public-engineering/issues/22>`_.

Installation
------------

Expand Down Expand Up @@ -95,17 +95,17 @@ Operations
Creating a user
~~~~~~~~~~~~~~~

The ecommerce user interface will be available at http://ecommerce.local.edly.io for a local instance, and at ``ECOMMERCE_HOST`` (by default: ``http(s)://ecommerce.<yours lms host>``) in production. In order to run commands from the UI, a user with admin rights must be created. There are two ways to proceed. To create a brand new user in E-Commerce which will not exist in the LMS, run::
The ecommerce user interface will be available at http://ecommerce.local.openedx.io for a local instance, and at ``ECOMMERCE_HOST`` (by default: ``http(s)://ecommerce.<yours lms host>``) in production. In order to run commands from the UI, a user with admin rights must be created. There are two ways to proceed. To create a brand new user in E-Commerce which will not exist in the LMS, run::

tutor local run ecommerce ./manage.py createsuperuser

Then login with this new user at: http://ecommerce.local.edly.io/admin/
Then login with this new user at: http://ecommerce.local.openedx.io/admin/

To re-use an existing LMS user, first go to http://ecommerce.local.edly.io/login. You should be redirected to the LMS login page, then to the dashboard. Then this user must be made a staff/superuser in E-Commerce::
To re-use an existing LMS user, first go to http://ecommerce.local.openedx.io/login. You should be redirected to the LMS login page, then to the dashboard. Then this user must be made a staff/superuser in E-Commerce::

tutor local run ecommerce ./manage.py shell -c "from django.contrib.auth import get_user_model; get_user_model().objects.filter(email='[email protected]').update(is_staff=True, is_superuser=True)"

Make sure to replace ``[email protected]`` by the actual user email address. You should then be able to view the Oscar dashboard at http://ecommerce.local.edly.io.
Make sure to replace ``[email protected]`` by the actual user email address. You should then be able to view the Oscar dashboard at http://ecommerce.local.openedx.io.


Custom payment processors
Expand All @@ -130,7 +130,7 @@ Then, build the image, pointing to your fork if necessary::
Development
~~~~~~~~~~~

When running Tutor in development mode, the ecommerce service is accessible at http://ecommerce.local.edly.io:8130.
When running Tutor in development mode, the ecommerce service is accessible at http://ecommerce.local.openedx.io:8130.

To mount a local ecommerce repository in the ecommerce container, add an auto-mounted repository with::

Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tutorecommerce/__about__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "18.0.1"
__version__ = "19.0.0"
2 changes: 2 additions & 0 deletions tutorecommerce/patches/mfe-dockerfile-pre-npm-build-orders
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# orders MFE does not support js plugins
RUN rm /openedx/app/env.config.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions tutorecommerce/templates/ecommerce/build/ecommerce/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 3d0c195

Please sign in to comment.