diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cd4a793..68ec228 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ variables: TUTOR_PLUGIN: notes TUTOR_IMAGES: notes TUTOR_PYPI_PACKAGE: tutor-notes - OPENEDX_RELEASE: koa + OPENEDX_RELEASE: lilac include: - project: 'community/tutor-ci' diff --git a/README.rst b/README.rst index eaee5e1..209a999 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,9 @@ Students notes plugin for `Tutor `_ =================================================================== -This is a plugin for `Tutor `_ to easily add the `Open edX note-taking app `_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation `_). +This is a plugin for `Tutor `_ to easily add the `Open edX note-taking app `_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation `_). -.. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-koa.master/_images/SFD_SN_bodyexample.png +.. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-lilac.master/_images/SFD_SN_bodyexample.png :alt: Notes in action Installation diff --git a/setup.py b/setup.py index bc0774e..2a01f24 100644 --- a/setup.py +++ b/setup.py @@ -31,7 +31,7 @@ setup( packages=find_packages(exclude=["tests*"]), include_package_data=True, python_requires=">=3.5", - install_requires=["tutor-openedx>=11.0.0,<12.0.0"], + install_requires=["tutor-openedx>=12.0.0,<13.0.0"], entry_points={"tutor.plugin.v0": ["notes = tutornotes.plugin"]}, classifiers=[ "Development Status :: 5 - Production/Stable", diff --git a/tutornotes/__about__.py b/tutornotes/__about__.py index b5d0980..62fd79e 100644 --- a/tutornotes/__about__.py +++ b/tutornotes/__about__.py @@ -1 +1,2 @@ -__version__ = "11.0.1" +__version__ = "12.0.0" + diff --git a/tutornotes/templates/notes/apps/settings/tutor.py b/tutornotes/templates/notes/apps/settings/tutor.py index a3e3873..2b82c17 100644 --- a/tutornotes/templates/notes/apps/settings/tutor.py +++ b/tutornotes/templates/notes/apps/settings/tutor.py @@ -23,13 +23,7 @@ DATABASES = { CLIENT_ID = "notes" CLIENT_SECRET = "{{ NOTES_OAUTH2_SECRET }}" -HAYSTACK_CONNECTIONS = { - "default": { - "ENGINE": "notesserver.highlight.ElasticsearchSearchEngine", - "URL": "http://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}/", - "INDEX_NAME": "notes", - } -} +ELASTICSEARCH_DSL = {'default': {'hosts': '{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}'}} LOGGING = { "version": 1,