63 Commits

Author SHA1 Message Date
Régis Behmo
d1c67f42d9 fix: remove pkg_resources for compatibility with python 3.12
pkg_resources is a package that is unavailable in python 3.12, unless
setuptools is explicitely installed. Turns out, there are replacement
functions coming from importlib_resources, which can be obtained from
the importlib-resources pypi package. This package will be installed
with tutor starting from 17.0.2.
2024-02-12 11:57:51 +01:00
jfavellar90
7f09751e8f chore: addressing comments 2023-12-11 18:12:10 +01:00
jfavellar90
8703186cef feat: upgrade to Quince 2023-12-09 17:43:42 +01:00
Régis Behmo
241283ea95 Merge branch 'master' into nightly 2023-12-09 17:42:22 +01:00
Emad Rad
b0ad257f63 feat: typing added 2023-12-09 15:56:42 +01:00
Emad Rad
e1eea67baf chore: cleanup with black and isort 2023-12-09 15:56:42 +01:00
Régis Behmo
be48edeb26 feat: simplify nightly version management
By pulling the version suffix from tutor, we avoid git conflicts when
merging the release branch in nightly.
2023-12-05 12:16:39 +01:00
Régis Behmo
18a6d5bc39
fix: add missing pkg-config package (#26)
Build fails in nightly with the following error:

	#28 5.503   × Getting requirements to build wheel did not run
	    successfully.
	#28 5.503   │ exit code: 1
	#28 5.503   ╰─> [24 lines of output]
	#28 5.503       /bin/sh: 1: pkg-config: not found
	#28 5.503       /bin/sh: 1: pkg-config: not found
	#28 5.503       Trying pkg-config --exists mysqlclient
	#28 5.503       Command 'pkg-config --exists mysqlclient' returned
	    non-zero exit status 127.
	#28 5.503       Trying pkg-config --exists mariadb
	#28 5.503       Command 'pkg-config --exists mariadb' returned non-zero
	    exit status 127.
	#28 5.503       Traceback (most recent call last):
	#28 5.503         File
	    "/openedx/venv/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py",
	line 353, in <module>
	#28 5.503           main()
	#28 5.503         File
	    "/openedx/venv/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py",
	line 335, in main
	#28 5.503           json_out['return_val'] =
	    hook(**hook_input['kwargs'])
	#28 5.503         File
	    "/openedx/venv/lib/python3.8/site-packages/pip/_vendor/pyproject_hooks/_in_process/_in_process.py",
	line 118, in get_requires_for_build_wheel
	#28 5.503           return hook(config_settings)
	#28 5.503         File
	    "/tmp/pip-build-env-58chejnv/overlay/lib/python3.8/site-packages/setuptools/build_meta.py",
	line 355, in get_requires_for_build_wheel
	#28 5.503           return self._get_build_requires(config_settings,
	    requirements=['wheel'])
	#28 5.503         File
	    "/tmp/pip-build-env-58chejnv/overlay/lib/python3.8/site-packages/setuptools/build_meta.py",
	line 325, in _get_build_requires
	#28 5.503           self.run_setup()
	#28 5.503         File
	    "/tmp/pip-build-env-58chejnv/overlay/lib/python3.8/site-packages/setuptools/build_meta.py",
	line 341, in run_setup
	#28 5.503           exec(code, locals())
	#28 5.503         File "<string>", line 154, in <module>
	#28 5.503         File "<string>", line 48, in get_config_posix
	#28 5.503         File "<string>", line 27, in find_package_name
	#28 5.503       Exception: Can not find valid pkg-config name.
	#28 5.503       Specify MYSQLCLIENT_CFLAGS and MYSQLCLIENT_LDFLAGS env
	    vars manuallY
2023-11-21 06:39:16 -05:00
Régis Behmo
7317758ca9 feat: simplify nightly version management
By pulling the version suffix from tutor, we avoid git conflicts when
merging the release branch in nightly.
2023-11-20 17:39:46 +01:00
Overhang.IO
f81740fa40 Merge remote-tracking branch 'origin/master' into nightly 2023-11-14 23:05:48 +00:00
jfavellar90
84ceed2f92 v16.0.2 2023-11-14 18:03:59 -05:00
ravikhetani
c93d2a3e35
fix: service "xqueue-job" depends on undefined service mysql: invalid compose project (#24)
* fix: docker compose error, dependency sql missing, when running with RUN_MYSQL=false

* fix spelling error

---------

Co-authored-by: Ravi Khetani <r.khetani@institute.global>
2023-11-14 18:01:33 -05:00
Régis Behmo
5da7bd3278 fix: nightly package version
The package version may not include the "-nightly" suffix. Otherwise,
`pip install .` fails with:

    setuptools.extern.packaging.version.InvalidVersion: Invalid version: '...-nightly'
2023-09-07 18:39:53 +02:00
Overhang.IO
790405a132 Merge remote-tracking branch 'origin/master' into nightly 2023-08-14 14:26:52 +00:00
Emad Rad
9e1296b6bd
docs: typos
* chore: wrong plugin name fixed
* chore: square characters replaced with "→"
2023-08-14 16:24:05 +02:00
Régis Behmo
ee0f3563e2 Merge branch 'master' into nightly 2023-08-09 10:34:31 +02:00
jfavellar90
18f202e593 v16.0.1 2023-08-04 08:16:30 -05:00
Overhang.IO
1ea66816ea Merge remote-tracking branch 'origin/master' into nightly 2023-07-31 13:41:11 +00:00
Jhony Avella
9ab9d85fc5
chore: remove xqueue permissions container
There is now a single "permissions" container that makes all permission changes in Tutor core
2023-07-31 15:35:37 +02:00
Régis Behmo
b3bc26036a Merge branch 'master' into nightly 2023-06-15 01:12:12 +02:00
Jhony Avella
8448e2ba2f
feat: upgrade to Palm 2023-06-15 01:04:59 +02:00
Régis Behmo
f9cf62c307 fix: nightly package version
The package version number may not include the "-nightly" suffix.
Otherwise, installation fails with:

   setuptools.extern.packaging.version.InvalidVersion: Invalid version: '15.0.7-nightly'
2023-05-26 18:47:48 +02:00
Régis Behmo
06c53909ba feat: label nightly version
This is to address https://github.com/overhangio/tutor-mfe/issues/122
As a consequence of this change, images will be tagged with a "-nightly"
suffix. Next, we'll probably have to build them periodically in CI.
2023-05-26 18:26:28 +02:00
Régis Behmo
ee1ade376a chore: handle nightly version numbers
Here, we make it possible to add a "-nightly" suffix to the package
version. This suffix will find its way to the Docker image tags. Thus,
the nightly branch will have different image tags. This will resolve
some confusion, as image tags are currently identical in nightly and
master.
2023-05-26 16:28:10 +02:00
Régis Behmo
8411ceef4f v15.0.1 2023-03-19 15:37:26 +01:00
Daniel Herrmann
04de8bcf67 Fix broken media download
The static map used with uwsgi was referencing the wrong media directory, such that downloads of media files did not work correctly.
2023-03-19 15:32:30 +01:00
Moisés Arévalo
7f66739ccd feat: updated to work with tutor olive 2022-12-12 18:55:56 +01:00
Carlos Muniz
4ac2ae8d59 feat: add COMPOSE_MOUNTS for xqueue
A `COMPOSE_MOUNTS` function has been added to easily mount
`xqueue` to `/openedx/xqueue`
2022-07-20 16:08:45 -04:00
GonzaloRomero
63fd458c8d feat: add name argument to click group 2022-06-09 21:44:13 +02:00
GonzaloRomero
0101e9dbab feat: Add CLI_COMMAND filter 2022-06-09 21:44:13 +02:00
GonzaloRomero
ea3fbafcaf feat: upgrade to nutmeg 2022-06-09 21:44:13 +02:00
Kyle McCormick
dff318bd2e feat: open stdin & allocate tty on dev services
This ensures that services started with `tutor dev start`
are as capable for breakpoint debugging, et al, as services
started with `tutor dev runserver` are. We plan to remove
`tutor dev runserver`.
2022-04-21 14:46:00 +02:00
Gabor Boros
cf7b593f76 fix: support mysql8 syntax
Signed-off-by: Gabor Boros <gabor.brs@gmail.com>
2022-04-15 10:45:09 +02:00
Régis Behmo
fb9e666814 feat: upgrade to maple 2021-11-15 08:38:52 +01:00
Régis Behmo
2109828bbf v12.1.0 2021-09-02 10:48:12 +02:00
Régis Behmo
029ac27251 feat: support for user-submitted files
Previously, user-uploaded files were stored in the /openedx/xqueue/openedx
folder (considered by django to be a media subfolder). This folder was not
being mounted on the host, thus causing files to be lost on container restart.
Also, files were simply not reported by the `tutor submissions show` utility.

We now bind-mount the media folder from the host. Media assets are served by
uwsgi, which replaced gunicorn.

When object storage is in use, we will have to point xqueue to the remote
storage solution. This means that we need to add patches to the tutor-minio
plugin.

Close #2.
2021-09-02 10:48:12 +02:00
Régis Behmo
3f78025010 refactor: rename xqueue_consumer to xqueue-consumer
This is for consistency with other docker-compose services.
2021-09-02 10:12:48 +02:00
Régis Behmo
6726dc36cc fix: dependency of docker-compose service on mysql
The declaration did not work when RUN_MYSQL was false.
2021-09-02 09:45:06 +02:00
Régis Behmo
f2912e69da Upgrade to lilac 2021-06-07 14:40:00 +02:00
Régis Behmo
7430c4b0ae fix: 'ln' error in image building
'/usr/bin/pip' now exists in ubuntu:20.04.
2021-06-07 10:13:25 +02:00
Régis Behmo
f9763b138f v11.0.1 2021-01-07 15:22:07 +01:00
Oleg Demakov
494d82f7b7 Add patch in the service config file to be able to redefine any settings 2021-01-07 15:19:52 +01:00
Régis Behmo
970dafe87b Upgrade to Koa 2020-12-09 22:29:07 +01:00
Régis Behmo
cb31ddfc3c Take advantage of automatically defined openedx version 2020-09-17 10:57:13 +02:00
Régis Behmo
e60428ae22 Upgrade to juniper.3 2020-08-27 17:43:11 +02:00
Régis Behmo
52dd830624 Make it possible to override individual docker registry 2020-07-21 09:12:32 +02:00
Régis Behmo
dbabdabe32 Upgrade to juniper.2 2020-07-16 11:26:20 +02:00
Régis Behmo
fd5b8b082a Upgrade to juniper 2020-06-15 11:06:39 +02:00
Régis Behmo
62b2407457 Customize mysql root username 2020-06-01 17:26:12 +02:00
Régis Behmo
141fc8bdf1 Make it possible to define xqueue url from env var 2020-05-13 11:21:37 +02:00