Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update requirements #24

Merged
merged 1 commit into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.8", "3.11", "3.12"]
python-version: ["3.11", "3.12"]
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're dropping the tests for Python 3.8, and we can no longer guarantee compatibility with Quince, should we bump the version, add an entry to the changelog, and update the compatibility table?

Copy link
Contributor

@mariajgrimaldi mariajgrimaldi Oct 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This plugin follows the tutor versioning convention, so this version (v17.x.x) doesn't necessarily support quince, although no significant changes have been made for a while. This makes me question if this plugin (edit: service) should follow the same convention that demands a new version each release cause we've been using the same for a while.

Now that Maga mentioned the compatibility table, can we update it to reflect the current plugin (edit: service) state?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reminder that this is not a Tutor plugin, this is essentially an IDA, tutor-contrib-codejail is the one that follows the Tutor versioning scheme. The actual plugin uses the compatible code of codejailservice for each release.

We decided to change the versioning scheme in redwood (see: #22). What should happen is that a new sumac branch is created, tutor-contrib-codejail builds using that branch until the release is ready and after that we tag sumac.1. I don't think the compatibility table in this repo is useful and I would rather remove it.

One thing that can be improved though, we should tag the other point-releases when they are ready.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, sorry. I edited my comment so it references the service instead.

I wasn't aware of the change in the versioning scheme. Should we remove the service releases to make it less confusing?

Copy link
Contributor

@mariajgrimaldi mariajgrimaldi Oct 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it makes sense, we can leave them up for history reasons, but it'd be good to drop the compatibility table that reference that release convention.


steps:
- uses: actions/checkout@v4
Expand Down
12 changes: 1 addition & 11 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Codejail service
===============
================

|ci-badge| |license-badge|

Expand Down Expand Up @@ -52,16 +52,6 @@ Run service

Enjoy the service!

Compatibility
-------------

+-------------------+----------------+
| Open edX Release | Tutor Version |
+===================+================+
| Lilac | >= 12.x |
+-------------------+----------------+
| Maple | >= 13.x |
+-------------------+----------------+

How to Contribute
-----------------
Expand Down
30 changes: 12 additions & 18 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,42 +1,36 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
blinker==1.7.0
blinker==1.8.2
# via flask
certifi==2024.2.2
certifi==2024.8.30
# via requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via requests
click==8.1.7
# via flask
edx-codejail==3.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
edx-codejail==3.5.1
# via -r requirements/base.in
flask==3.0.3
# via -r requirements/base.in
idna==3.7
idna==3.10
# via requests
importlib-metadata==7.1.0
# via flask
itsdangerous==2.2.0
# via flask
jinja2==3.1.3
jinja2==3.1.4
# via flask
markupsafe==2.1.5
markupsafe==3.0.2
# via
# jinja2
# werkzeug
requests==2.31.0
requests==2.32.3
# via -r requirements/base.in
six==1.16.0
# via edx-codejail
urllib3==2.2.1
urllib3==2.2.3
# via requests
werkzeug==3.0.2
werkzeug==3.0.4
# via flask
zipp==3.18.1
# via importlib-metadata
1 change: 0 additions & 1 deletion requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
# link to other information that will help people in the future to remove the
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.
edx-codejail==3.2.0
mariajgrimaldi marked this conversation as resolved.
Show resolved Hide resolved
73 changes: 27 additions & 46 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,47 +1,39 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
astroid==3.1.0
astroid==3.3.5
# via pylint
blinker==1.7.0
blinker==1.8.2
# via
# -r requirements/base.txt
# flask
certifi==2024.2.2
certifi==2024.8.30
# via
# -r requirements/base.txt
# requests
charset-normalizer==3.3.2
charset-normalizer==3.4.0
# via
# -r requirements/base.txt
# requests
click==8.1.7
# via
# -r requirements/base.txt
# flask
coverage==7.5.0
coverage==7.6.4
# via -r requirements/dev.in
dill==0.3.8
dill==0.3.9
# via pylint
edx-codejail==3.2.0
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
exceptiongroup==1.2.1
# via pytest
edx-codejail==3.5.1
# via -r requirements/base.txt
flask==3.0.3
# via -r requirements/base.txt
idna==3.7
idna==3.10
# via
# -r requirements/base.txt
# requests
importlib-metadata==7.1.0
# via
# -r requirements/base.txt
# flask
iniconfig==2.0.0
# via pytest
isort==5.13.2
Expand All @@ -52,75 +44,64 @@ itsdangerous==2.2.0
# flask
jedi==0.19.1
# via pudb
jinja2==3.1.3
jinja2==3.1.4
# via
# -r requirements/base.txt
# flask
markupsafe==2.1.5
markupsafe==3.0.2
# via
# -r requirements/base.txt
# jinja2
# werkzeug
mccabe==0.7.0
# via pylint
packaging==24.0
packaging==24.1
# via
# pudb
# pytest
parso==0.8.4
# via jedi
platformdirs==4.2.1
platformdirs==4.3.6
# via pylint
pluggy==1.5.0
# via pytest
pudb==2024.1
pudb==2024.1.3
# via -r requirements/dev.in
pycodestyle==2.11.1
pycodestyle==2.12.1
# via -r requirements/dev.in
pydocstyle==6.3.0
# via -r requirements/dev.in
pygments==2.17.2
pygments==2.18.0
# via pudb
pylint==3.1.0
pylint==3.3.1
# via -r requirements/dev.in
pytest==8.1.1
pytest==8.3.3
# via -r requirements/dev.in
requests==2.31.0
requests==2.32.3
# via -r requirements/base.txt
six==1.16.0
# via
# -r requirements/base.txt
# edx-codejail
snowballstemmer==2.2.0
# via pydocstyle
tomli==2.0.1
# via
# pylint
# pytest
tomlkit==0.12.4
tomlkit==0.13.2
# via pylint
typing-extensions==4.11.0
# via
# astroid
# pylint
# urwid
urllib3==2.2.1
typing-extensions==4.12.2
# via urwid
urllib3==2.2.3
# via
# -r requirements/base.txt
# requests
urwid==2.6.11
urwid==2.6.16
# via
# pudb
# urwid-readline
urwid-readline==0.14
urwid-readline==0.15.1
# via pudb
wcwidth==0.2.13
# via urwid
werkzeug==3.0.2
werkzeug==3.0.4
# via
# -r requirements/base.txt
# flask
zipp==3.18.1
# via
# -r requirements/base.txt
# importlib-metadata
19 changes: 5 additions & 14 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,23 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
build==1.2.1
build==1.2.2.post1
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==7.1.0
# via build
packaging==24.0
packaging==24.1
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via
# build
# pip-tools
tomli==2.0.1
pyproject-hooks==1.2.0
# via
# build
# pip-tools
# pyproject-hooks
wheel==0.43.0
wheel==0.44.0
# via pip-tools
zipp==3.18.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
8 changes: 4 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
wheel==0.43.0
wheel==0.44.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.0
pip==24.2
# via -r requirements/pip.in
setuptools==69.5.1
setuptools==75.2.0
# via -r requirements/pip.in