tutor-notes 18.0.0__tar.gz → 19.0.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. {tutor-notes-18.0.0/tutor_notes.egg-info → tutor_notes-19.0.0}/PKG-INFO +11 -11
  2. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/README.rst +4 -4
  3. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/setup.py +6 -6
  4. {tutor-notes-18.0.0 → tutor_notes-19.0.0/tutor_notes.egg-info}/PKG-INFO +11 -11
  5. tutor_notes-19.0.0/tutor_notes.egg-info/requires.txt +4 -0
  6. tutor_notes-19.0.0/tutornotes/__about__.py +1 -0
  7. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/local-docker-compose-jobs-services +3 -0
  8. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/local-docker-compose-services +3 -0
  9. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/plugin.py +1 -1
  10. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/templates/notes/apps/settings/tutor.py +7 -6
  11. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/templates/notes/build/notes/Dockerfile +14 -11
  12. tutor_notes-19.0.0/tutornotes/templates/notes/tasks/notes/init +4 -0
  13. tutor-notes-18.0.0/tutor_notes.egg-info/requires.txt +0 -4
  14. tutor-notes-18.0.0/tutornotes/__about__.py +0 -1
  15. tutor-notes-18.0.0/tutornotes/templates/notes/tasks/notes/init +0 -2
  16. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/LICENSE.txt +0 -0
  17. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/MANIFEST.in +0 -0
  18. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/pyproject.toml +0 -0
  19. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/setup.cfg +0 -0
  20. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutor_notes.egg-info/SOURCES.txt +0 -0
  21. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutor_notes.egg-info/dependency_links.txt +0 -0
  22. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutor_notes.egg-info/entry_points.txt +0 -0
  23. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutor_notes.egg-info/top_level.txt +0 -0
  24. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/__init__.py +0 -0
  25. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/caddyfile +0 -0
  26. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/k8s-deployments +0 -0
  27. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/k8s-jobs +0 -0
  28. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/k8s-services +0 -0
  29. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/kustomization-configmapgenerator +0 -0
  30. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/local-docker-compose-dev-services +0 -0
  31. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/local-docker-compose-permissions-command +0 -0
  32. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/local-docker-compose-permissions-volumes +0 -0
  33. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/openedx-common-settings +0 -0
  34. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/openedx-lms-common-settings +0 -0
  35. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/openedx-lms-development-settings +0 -0
  36. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/patches/openedx-lms-production-settings +0 -0
  37. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/templates/notes/tasks/lms/init +0 -0
  38. {tutor-notes-18.0.0 → tutor_notes-19.0.0}/tutornotes/templates/notes/tasks/mysql/init +0 -0
@@ -1,10 +1,10 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tutor-notes
3
- Version: 18.0.0
3
+ Version: 19.0.0
4
4
  Summary: A Tutor plugin for student notes
5
5
  Home-page: https://docs.tutor.edly.io/
6
- Author: Overhang.IO
7
- Author-email: contact@overhang.io
6
+ Author: Edly
7
+ Author-email: hello@edly.io
8
8
  Maintainer: eduNEXT
9
9
  License: AGPLv3
10
10
  Project-URL: Documentation, https://docs.tutor.edly.io/
@@ -16,23 +16,23 @@ Classifier: Intended Audience :: Developers
16
16
  Classifier: License :: OSI Approved :: GNU Affero General Public License v3
17
17
  Classifier: Operating System :: OS Independent
18
18
  Classifier: Programming Language :: Python
19
- Classifier: Programming Language :: Python :: 3.8
20
19
  Classifier: Programming Language :: Python :: 3.9
21
20
  Classifier: Programming Language :: Python :: 3.10
22
21
  Classifier: Programming Language :: Python :: 3.11
23
22
  Classifier: Programming Language :: Python :: 3.12
24
- Requires-Python: >=3.8
23
+ Requires-Python: >=3.9
24
+ Description-Content-Type: text/x-rst
25
25
  License-File: LICENSE.txt
26
- Requires-Dist: tutor<19.0.0,>=18.0.0
26
+ Requires-Dist: tutor<20.0.0,>=19.0.0
27
27
  Provides-Extra: dev
28
- Requires-Dist: tutor[dev]<19.0.0,>=18.0.0; extra == "dev"
28
+ Requires-Dist: tutor[dev]<20.0.0,>=19.0.0; extra == "dev"
29
29
 
30
30
  Students notes plugin for `Tutor <https://docs.tutor.edly.io>`_
31
31
  ===================================================================
32
32
 
33
- This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/exercises_tools/notes.html>`_).
33
+ This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://docs.openedx.org/en/latest/educators/how-tos/course_development/exercise_tools/enable_notes.html>`_).
34
34
 
35
- .. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/_images/SFD_SN_bodyexample.png
35
+ .. image:: https://docs.openedx.org/en/latest/_images/SFD_SN_bodyexample.png
36
36
  :alt: Notes in action
37
37
 
38
38
  Installation
@@ -52,7 +52,7 @@ Then, to make migrations & tasks::
52
52
 
53
53
  You should beware that the ``notes.<LMS_HOST>`` domain name should exist and point to your server. For instance, if your LMS is hosted at http://myopenedx.com, the notes service should be found at http://notes.myopenedx.com.
54
54
 
55
- If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.edly.io.
55
+ If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.openedx.io.
56
56
 
57
57
  To enable student notes for a specific course, you should go to the course advanced settings in the studio, and set "Enable Student Notes" to "true". Then, hit "save changes".
58
58
 
@@ -88,4 +88,4 @@ This Tutor plugin is maintained by Jhony Avella from `eduNEXT <https://www.edune
88
88
  License
89
89
  -------
90
90
 
91
- This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/master/LICENSE.txt>`_.
91
+ This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/release/LICENSE.txt>`_.
@@ -1,9 +1,9 @@
1
1
  Students notes plugin for `Tutor <https://docs.tutor.edly.io>`_
2
2
  ===================================================================
3
3
 
4
- This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/exercises_tools/notes.html>`_).
4
+ This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://docs.openedx.org/en/latest/educators/how-tos/course_development/exercise_tools/enable_notes.html>`_).
5
5
 
6
- .. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/_images/SFD_SN_bodyexample.png
6
+ .. image:: https://docs.openedx.org/en/latest/_images/SFD_SN_bodyexample.png
7
7
  :alt: Notes in action
8
8
 
9
9
  Installation
@@ -23,7 +23,7 @@ Then, to make migrations & tasks::
23
23
 
24
24
  You should beware that the ``notes.<LMS_HOST>`` domain name should exist and point to your server. For instance, if your LMS is hosted at http://myopenedx.com, the notes service should be found at http://notes.myopenedx.com.
25
25
 
26
- If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.edly.io.
26
+ If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.openedx.io.
27
27
 
28
28
  To enable student notes for a specific course, you should go to the course advanced settings in the studio, and set "Enable Student Notes" to "true". Then, hit "save changes".
29
29
 
@@ -59,4 +59,4 @@ This Tutor plugin is maintained by Jhony Avella from `eduNEXT <https://www.edune
59
59
  License
60
60
  -------
61
61
 
62
- This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/master/LICENSE.txt>`_.
62
+ This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/release/LICENSE.txt>`_.
@@ -24,16 +24,17 @@ setup(
24
24
  "Community": "https://discuss.openedx.org",
25
25
  },
26
26
  license="AGPLv3",
27
- author="Overhang.IO",
28
- author_email="contact@overhang.io",
27
+ author="Edly",
28
+ author_email="hello@edly.io",
29
29
  maintainer="eduNEXT",
30
30
  description="A Tutor plugin for student notes",
31
31
  long_description=readme,
32
+ long_description_content_type="text/x-rst",
32
33
  packages=find_packages(exclude=["tests*"]),
33
34
  include_package_data=True,
34
- python_requires=">=3.8",
35
- install_requires=["tutor>=18.0.0,<19.0.0"],
36
- extras_require={"dev": ["tutor[dev]>=18.0.0,<19.0.0"]},
35
+ python_requires=">=3.9",
36
+ install_requires=["tutor>=19.0.0,<20.0.0"],
37
+ extras_require={"dev": ["tutor[dev]>=19.0.0,<20.0.0"]},
37
38
  entry_points={"tutor.plugin.v1": ["notes = tutornotes.plugin"]},
38
39
  classifiers=[
39
40
  "Development Status :: 5 - Production/Stable",
@@ -41,7 +42,6 @@ setup(
41
42
  "License :: OSI Approved :: GNU Affero General Public License v3",
42
43
  "Operating System :: OS Independent",
43
44
  "Programming Language :: Python",
44
- "Programming Language :: Python :: 3.8",
45
45
  "Programming Language :: Python :: 3.9",
46
46
  "Programming Language :: Python :: 3.10",
47
47
  "Programming Language :: Python :: 3.11",
@@ -1,10 +1,10 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: tutor-notes
3
- Version: 18.0.0
3
+ Version: 19.0.0
4
4
  Summary: A Tutor plugin for student notes
5
5
  Home-page: https://docs.tutor.edly.io/
6
- Author: Overhang.IO
7
- Author-email: contact@overhang.io
6
+ Author: Edly
7
+ Author-email: hello@edly.io
8
8
  Maintainer: eduNEXT
9
9
  License: AGPLv3
10
10
  Project-URL: Documentation, https://docs.tutor.edly.io/
@@ -16,23 +16,23 @@ Classifier: Intended Audience :: Developers
16
16
  Classifier: License :: OSI Approved :: GNU Affero General Public License v3
17
17
  Classifier: Operating System :: OS Independent
18
18
  Classifier: Programming Language :: Python
19
- Classifier: Programming Language :: Python :: 3.8
20
19
  Classifier: Programming Language :: Python :: 3.9
21
20
  Classifier: Programming Language :: Python :: 3.10
22
21
  Classifier: Programming Language :: Python :: 3.11
23
22
  Classifier: Programming Language :: Python :: 3.12
24
- Requires-Python: >=3.8
23
+ Requires-Python: >=3.9
24
+ Description-Content-Type: text/x-rst
25
25
  License-File: LICENSE.txt
26
- Requires-Dist: tutor<19.0.0,>=18.0.0
26
+ Requires-Dist: tutor<20.0.0,>=19.0.0
27
27
  Provides-Extra: dev
28
- Requires-Dist: tutor[dev]<19.0.0,>=18.0.0; extra == "dev"
28
+ Requires-Dist: tutor[dev]<20.0.0,>=19.0.0; extra == "dev"
29
29
 
30
30
  Students notes plugin for `Tutor <https://docs.tutor.edly.io>`_
31
31
  ===================================================================
32
32
 
33
- This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/exercises_tools/notes.html>`_).
33
+ This is a plugin for `Tutor <https://docs.tutor.edly.io>`_ to easily add the `Open edX note-taking app <https://github.com/openedx/edx-notes-api>`_ to an Open edX platform. This app allows students to annotate portions of the courseware (see `the official documentation <https://docs.openedx.org/en/latest/educators/how-tos/course_development/exercise_tools/enable_notes.html>`_).
34
34
 
35
- .. image:: https://edx.readthedocs.io/projects/open-edx-building-and-running-a-course/en/open-release-redwood.master/_images/SFD_SN_bodyexample.png
35
+ .. image:: https://docs.openedx.org/en/latest/_images/SFD_SN_bodyexample.png
36
36
  :alt: Notes in action
37
37
 
38
38
  Installation
@@ -52,7 +52,7 @@ Then, to make migrations & tasks::
52
52
 
53
53
  You should beware that the ``notes.<LMS_HOST>`` domain name should exist and point to your server. For instance, if your LMS is hosted at http://myopenedx.com, the notes service should be found at http://notes.myopenedx.com.
54
54
 
55
- If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.edly.io.
55
+ If you would like to host the notes service at a different domain name, you can set the ``NOTES_HOST`` configuration variable (see below). When testing Tutor on a local computer, this will be automatically set to notes.local.openedx.io.
56
56
 
57
57
  To enable student notes for a specific course, you should go to the course advanced settings in the studio, and set "Enable Student Notes" to "true". Then, hit "save changes".
58
58
 
@@ -88,4 +88,4 @@ This Tutor plugin is maintained by Jhony Avella from `eduNEXT <https://www.edune
88
88
  License
89
89
  -------
90
90
 
91
- This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/master/LICENSE.txt>`_.
91
+ This software is licensed under the terms of the `GNU Affero General Public License (AGPL) <https://github.com/overhangio/tutor-notes/blob/release/LICENSE.txt>`_.
@@ -0,0 +1,4 @@
1
+ tutor<20.0.0,>=19.0.0
2
+
3
+ [dev]
4
+ tutor[dev]<20.0.0,>=19.0.0
@@ -0,0 +1 @@
1
+ __version__ = "19.0.0"
@@ -4,4 +4,7 @@ notes-job:
4
4
  DJANGO_SETTINGS_MODULE: notesserver.settings.tutor
5
5
  volumes:
6
6
  - ../plugins/notes/apps/settings/tutor.py:/app/edx-notes-api/notesserver/settings/tutor.py:ro
7
+ {%- for mount in iter_mounts(MOUNTS, "notes") %}
8
+ - {{ mount }}
9
+ {%- endfor %}
7
10
  depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
@@ -6,5 +6,8 @@ notes:
6
6
  volumes:
7
7
  - ../plugins/notes/apps/settings/tutor.py:/app/edx-notes-api/notesserver/settings/tutor.py:ro
8
8
  - ../../data/notes:/app/data
9
+ {%- for mount in iter_mounts(MOUNTS, "notes") %}
10
+ - {{ mount }}
11
+ {%- endfor %}
9
12
  restart: unless-stopped
10
13
  depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
@@ -10,7 +10,7 @@ from tutor.__about__ import __version_suffix__
10
10
 
11
11
  from .__about__ import __version__
12
12
 
13
- # Handle version suffix in nightly mode, just like tutor core
13
+ # Handle version suffix in main mode, just like tutor core
14
14
  if __version_suffix__:
15
15
  __version__ += "-" + __version_suffix__
16
16
 
@@ -10,7 +10,7 @@ DATABASES = {
10
10
  "default": {
11
11
  "ENGINE": "django.db.backends.mysql",
12
12
  "HOST": "{{ MYSQL_HOST }}",
13
- "PORT": {{MYSQL_PORT}},
13
+ "PORT": {{ MYSQL_PORT }},
14
14
  "NAME": "{{ NOTES_MYSQL_DATABASE }}",
15
15
  "USER": "{{ NOTES_MYSQL_USERNAME }}",
16
16
  "PASSWORD": "{{ NOTES_MYSQL_PASSWORD }}",
@@ -23,11 +23,12 @@ DATABASES = {
23
23
  CLIENT_ID = "notes"
24
24
  CLIENT_SECRET = "{{ NOTES_OAUTH2_SECRET }}"
25
25
 
26
- ELASTICSEARCH_DSL = {
27
- 'default': {
28
- 'hosts': '{{ ELASTICSEARCH_SCHEME }}://{{ ELASTICSEARCH_HOST }}:{{ ELASTICSEARCH_PORT }}'
29
- }
30
- }
26
+ # Meilisearch credentials
27
+ ES_DISABLED = True
28
+ MEILISEARCH_ENABLED = True
29
+ MEILISEARCH_URL = "{{ MEILISEARCH_URL }}"
30
+ MEILISEARCH_API_KEY = "{{ MEILISEARCH_API_KEY }}"
31
+ MEILISEARCH_INDEX = "{{ MEILISEARCH_INDEX_PREFIX }}student_notes"
31
32
 
32
33
  LOGGING = {
33
34
  "version": 1,
@@ -1,21 +1,24 @@
1
1
  # syntax=docker/dockerfile:1.4
2
- FROM docker.io/python:3.12-slim-bookworm
2
+ FROM docker.io/ubuntu:24.04
3
3
 
4
4
  ENV DEBIAN_FRONTEND=noninteractive
5
+
6
+ # Delete default UID=1000 `ubuntu` user to ensure we can use id 1000 for app user
7
+ RUN userdel -r ubuntu
8
+
5
9
  RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
6
10
  --mount=type=cache,target=/var/lib/apt,sharing=locked \
7
11
  apt update && \
8
12
  apt upgrade -y && \
9
13
  apt install -y \
10
- locales \
14
+ language-pack-en \
11
15
  git \
12
- python3-dev \
13
- build-essential \
14
- default-libmysqlclient-dev \
15
- pkg-config && \
16
- sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
17
- locale-gen
18
- ENV LC_ALL en_US.UTF-8
16
+ python3 \
17
+ python3-pip \
18
+ python3-venv \
19
+ libmysqlclient-dev \
20
+ pkg-config
21
+ RUN ln -s /usr/bin/python3 /usr/bin/python
19
22
 
20
23
  ###### Git-clone Notes repo ######
21
24
  ARG APP_USER_ID=1000
@@ -27,11 +30,11 @@ WORKDIR /app/edx-notes-api
27
30
 
28
31
  ###### Install python venv ######
29
32
  RUN python -m venv /app/venv
30
- ENV PATH /app/venv/bin:${PATH}
33
+ ENV PATH=/app/venv/bin:${PATH}
31
34
  # https://pypi.org/project/setuptools/
32
35
  # https://pypi.org/project/pip/
33
36
  # https://pypi.org/project/wheel/
34
- RUN --mount=type=cache,target=/app/.cache/pip,sharing=shared pip install setuptools==69.2.0 pip==24.0 wheel==0.43.0
37
+ RUN --mount=type=cache,target=/app/.cache/pip,sharing=shared pip install setuptools==75.2.0 pip==24.2 wheel==0.44.0
35
38
  RUN --mount=type=cache,target=/app/.cache/pip,sharing=shared pip install -r requirements/base.txt
36
39
 
37
40
  EXPOSE 8000
@@ -0,0 +1,4 @@
1
+ ./manage.py migrate
2
+
3
+ # Re-index with meilisearch
4
+ ./manage.py shell -c "from notesapi.v1.views.meilisearch import reindex; reindex()"
@@ -1,4 +0,0 @@
1
- tutor<19.0.0,>=18.0.0
2
-
3
- [dev]
4
- tutor[dev]<19.0.0,>=18.0.0
@@ -1 +0,0 @@
1
- __version__ = "18.0.0"
@@ -1,2 +0,0 @@
1
- ./manage.py migrate
2
- ./manage.py search_index --rebuild -f
File without changes
File without changes
File without changes