Skip to content

Commit

Permalink
Merge pull request #181 from edly-io/omer/replace_pkg_resources
Browse files Browse the repository at this point in the history
xblock-sql-grader | Drop py3.8 support | replace pkg_resource with importlib.resources
  • Loading branch information
Feanil Patel authored Sep 27, 2024
2 parents a6f5321 + 62f331c commit af4c12e
Show file tree
Hide file tree
Showing 11 changed files with 92 additions and 164 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v3
with:
python-version: 3.8
python-version: 3.12

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
28 changes: 11 additions & 17 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# 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
Expand All @@ -8,48 +8,42 @@ appdirs==1.4.4
# via fs
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
django==4.2.11
django==4.2.16
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
edx-codejail==3.3.3
edx-codejail==3.4.1
# via -r requirements/base.in
fs==2.4.16
# via xblock
lxml==5.2.1
lxml==5.3.0
# via xblock
mako==1.3.2
mako==1.3.5
# via xblock
markupsafe==2.1.5
# via
# mako
# xblock
python-dateutil==2.9.0.post0
# via xblock
pytz==2024.1
pytz==2024.2
# via xblock
pyyaml==6.0.1
pyyaml==6.0.2
# via xblock
simplejson==3.19.2
simplejson==3.19.3
# via xblock
six==1.16.0
# via
# edx-codejail
# fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.1
# via django
typing-extensions==4.10.0
# via asgiref
web-fragments==2.2.0
# via xblock
webob==1.8.7
webob==1.8.8
# via xblock
xblock==3.1.0
xblock==5.1.0
# via -r requirements/base.in

# The following packages are considered to be unsafe in a requirements file:
Expand Down
23 changes: 9 additions & 14 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#
# 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
#
cachetools==5.3.3
cachetools==5.5.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -20,37 +20,32 @@ distlib==0.3.8
# via
# -r requirements/tox.txt
# virtualenv
filelock==3.13.3
filelock==3.16.0
# via
# -r requirements/tox.txt
# tox
# virtualenv
packaging==24.0
packaging==24.1
# via
# -r requirements/tox.txt
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.3.2
# via
# -r requirements/tox.txt
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/tox.txt
# tox
pyproject-api==1.6.1
pyproject-api==1.7.1
# via
# -r requirements/tox.txt
# tox
tomli==2.0.1
# via
# -r requirements/tox.txt
# pyproject-api
# tox
tox==4.14.2
tox==4.18.1
# via -r requirements/tox.txt
virtualenv==20.25.1
virtualenv==20.26.4
# via
# -r requirements/tox.txt
# tox
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.2.0
setuptools==74.1.2
# via -r requirements/pip.in
21 changes: 5 additions & 16 deletions requirements/pip_tools.txt
Original file line number Diff line number Diff line change
@@ -1,34 +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
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.11.0
# via
# -c requirements/common_constraints.txt
# 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.1.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
59 changes: 26 additions & 33 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# 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
Expand All @@ -12,36 +12,35 @@ asgiref==3.8.1
# via
# -r requirements/base.txt
# django
astroid==3.1.0
astroid==3.2.4
# via pylint
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# django
coverage==7.4.4
coverage==7.6.1
# via -r requirements/test.txt
dill==0.3.8
# via pylint
django==4.2.11
django==4.2.16
# via
# -c requirements/common_constraints.txt
# -r requirements/base.txt
edx-codejail==3.3.3
dnspython==2.6.1
# via
# -r requirements/test.txt
# pymongo
edx-codejail==3.4.1
# via -r requirements/base.txt
edx-opaque-keys==2.5.1
edx-opaque-keys==2.11.0
# via -r requirements/test.txt
fs==2.4.16
# via
# -r requirements/base.txt
# xblock
isort==5.13.2
# via pylint
lxml==5.2.1
lxml==5.3.0
# via
# -r requirements/base.txt
# xblock
mako==1.3.2
mako==1.3.5
# via
# -r requirements/base.txt
# xblock
Expand All @@ -52,33 +51,33 @@ markupsafe==2.1.5
# xblock
mccabe==0.7.0
# via pylint
pbr==6.0.0
pbr==6.1.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==4.2.0
platformdirs==4.3.2
# via pylint
pycodestyle==2.11.1
pycodestyle==2.12.1
# via -r requirements/quality.in
pylint==3.1.0
pylint==3.2.7
# via -r requirements/quality.in
pymongo==3.13.0
pymongo==4.8.0
# via
# -r requirements/test.txt
# edx-opaque-keys
python-dateutil==2.9.0.post0
# via
# -r requirements/base.txt
# xblock
pytz==2024.1
pytz==2024.2
# via
# -r requirements/base.txt
# xblock
pyyaml==6.0.1
pyyaml==6.0.2
# via
# -r requirements/base.txt
# xblock
simplejson==3.19.2
simplejson==3.19.3
# via
# -r requirements/base.txt
# xblock
Expand All @@ -88,35 +87,29 @@ six==1.16.0
# edx-codejail
# fs
# python-dateutil
sqlparse==0.4.4
sqlparse==0.5.1
# via
# -r requirements/base.txt
# django
stevedore==5.2.0
stevedore==5.3.0
# via
# -r requirements/test.txt
# edx-opaque-keys
tomli==2.0.1
# via pylint
tomlkit==0.12.4
tomlkit==0.13.2
# via pylint
typing-extensions==4.10.0
typing-extensions==4.12.2
# via
# -r requirements/base.txt
# -r requirements/test.txt
# asgiref
# astroid
# edx-opaque-keys
# pylint
web-fragments==2.2.0
# via
# -r requirements/base.txt
# xblock
webob==1.8.7
webob==1.8.8
# via
# -r requirements/base.txt
# xblock
xblock==3.1.0
xblock==5.1.0
# via -r requirements/base.txt

# The following packages are considered to be unsafe in a requirements file:
Expand Down
16 changes: 9 additions & 7 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
#
# 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
#
coverage==7.4.4
coverage==7.6.1
# via -r requirements/test.in
edx-opaque-keys==2.5.1
dnspython==2.6.1
# via pymongo
edx-opaque-keys==2.11.0
# via -r requirements/test.in
pbr==6.0.0
pbr==6.1.0
# via stevedore
pymongo==3.13.0
pymongo==4.8.0
# via edx-opaque-keys
stevedore==5.2.0
stevedore==5.3.0
# via edx-opaque-keys
typing-extensions==4.10.0
typing-extensions==4.12.2
# via edx-opaque-keys
Loading

0 comments on commit af4c12e

Please sign in to comment.