feat: upgrade to olive

.gitlab-ci.yml

@@ -2,7 +2,7 @@ variables:
     TUTOR_PLUGIN: discovery
     TUTOR_IMAGES: discovery
     TUTOR_PYPI_PACKAGE: tutor-discovery
-    OPENEDX_RELEASE: nutmeg
+    OPENEDX_RELEASE: olive
     GITHUB_REPO: overhangio/tutor-discovery
 
 include:

README.rst

@@ -32,7 +32,7 @@ Creating a user
 
 The discovery user interface will be available at http://discovery.local.overhang.io for a local test instance, and at ``DISCOVERY_HOST`` (by default: http(s)://discovery.<your lms host>) in production. In order to run commands from the UI, a user must be created::
 
-  tutor local run discovery ./manage.py createsuperuser
+    tutor local run discovery ./manage.py createsuperuser
 
 Then, you must login with this user at http://discovery.local.overhang.io/admin.
 
@@ -55,8 +55,8 @@ Re-indexing courses
 
 ::
 
-  tutor local run discovery ./manage.py refresh_course_metadata --partner_code=openedx
-  tutor local run discovery ./manage.py update_index --disable-change-limit
+    tutor local run discovery ./manage.py refresh_course_metadata --partner_code=openedx
+    tutor local run discovery ./manage.py update_index --disable-change-limit
 
 Caching programs
 ~~~~~~~~~~~~~~~~
@@ -92,6 +92,22 @@ Troubleshooting
 
 This Tutor plugin is maintained by Régis Behmo from `Overhang.IO <https://overhang.io>`__. Community support is available from the official `Open edX forum <https://discuss.openedx.org>`__. Do you need help with this plugin? See the `troubleshooting <https://docs.tutor.overhang.io/troubleshooting.html>`__ section from the Tutor documentation.
 
+
+`Max retries exceeded with url`
++++++++++++++++++++++++++++++++
+
+When running in production with HTTPS enabled, you may face this error during the `init` phase of `tutor local launch`:
+
+```
+requests.exceptions.ConnectionError: HTTPSConnectionPool(host='<LMS_HOST>', port=443): Max retries exceeded with url: /api/courses/v1/courses/?page=1&page_size=10&username=discovery
+```
+
+This error may be due to an incorrect DNS resolution of the LMS DNS record. With some cloud providers (for instance: [DigitalOcean](https://digitalocean.com/)) the `/etc/hosts` file on the host automatically contains the following entry::
+
+    127.0.1.1 <LMS HOST>
+
+This entry may be present if you named your server with the LMS hostname.
+
 License
 -------
 

setup.py

@@ -33,8 +33,8 @@
     long_description=readme,
     packages=find_packages(exclude=["tests*"]),
     include_package_data=True,
-    install_requires=["tutor>=14.0.0,<15.0.0"],
-    python_requires=">=3.5",
+    install_requires=["tutor>=15.0.0,<16.0.0"],
+    python_requires=">=3.7",
     entry_points={"tutor.plugin.v1": ["discovery = tutordiscovery.plugin"]},
     classifiers=[
         "Development Status :: 5 - Production/Stable",

tutordiscovery/__about__.py

@@ -1 +1 @@
-__version__ = "14.0.1"
+__version__ = "15.0.0"

tutordiscovery/templates/discovery/build/discovery/Dockerfile

@@ -3,7 +3,7 @@ FROM docker.io/ubuntu:20.04
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update && \
   apt install -y curl git-core language-pack-en python3 python3-pip python3-venv \
-  build-essential libffi-dev libmysqlclient-dev libxml2-dev libxslt-dev libjpeg-dev libssl-dev
+  build-essential libcairo2 libffi-dev libmysqlclient-dev libxml2-dev libxslt-dev libjpeg-dev libssl-dev
 ENV LC_ALL en_US.UTF-8
 
 ARG APP_USER_ID=1000
@@ -26,7 +26,7 @@ ENV PATH "/openedx/venv/bin:$PATH"
 # https://pypi.org/project/setuptools/
 # https://pypi.org/project/pip/
 # https://pypi.org/project/wheel/
-RUN pip install setuptools==62.1.0 pip==22.0.4 wheel==0.37.1
+RUN pip install setuptools==65.5.1 pip==22.3.1 wheel==0.38.4
 
 # Install a recent version of nodejs
 RUN pip install nodeenv
@@ -48,7 +48,7 @@ RUN pip install django-redis==5.2.0
 
 # Install uwsgi
 # https://pypi.org/project/uWSGI/
-RUN pip install uwsgi==2.0.20
+RUN pip install uwsgi==2.0.21
 
 # Collect static assets
 COPY --chown=app:app assets.py ./course_discovery/settings/assets.py