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

Drop py3.8 support | Replace pkg_resources lib with importlib.resources #181

Merged
merged 6 commits into from
Oct 25, 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 @@ -17,8 +17,8 @@ jobs:
os:
- ubuntu-latest
python-version:
- 3.8
- 3.11
- 3.12

steps:
- uses: actions/checkout@v4
Expand Down
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@v5
with:
python-version: 3.8
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion crowdsourcehinter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from .crowdsourcehinter import CrowdsourceHinter

__version__ = '0.7'
__version__ = '0.8'
10 changes: 6 additions & 4 deletions crowdsourcehinter/crowdsourcehinter.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,19 @@
import logging
import random

import pkg_resources

import six.moves.html_parser
import six.moves.urllib.error
import six.moves.urllib.parse
import six.moves.urllib.request
from web_fragments.fragment import Fragment
from xblock.core import XBlock
from xblock.fields import Dict, List, Scope, String
try:
from xblock.utils.resources import ResourceLoader
except ModuleNotFoundError: # For backward compatibility with releases older than Quince.
from xblockutils.resources import ResourceLoader

resource_loader = ResourceLoader(__name__)
log = logging.getLogger(__name__)
html_parser = six.moves.html_parser.HTMLParser()

Expand Down Expand Up @@ -443,8 +446,7 @@ def resource_string(self, path):
"""
This function is used to get the path of static resources.
"""
data = pkg_resources.resource_string(__name__, path)
return data.decode("utf8")
return resource_loader.load_unicode(path)

def get_user_is_staff(self):
"""
Expand Down
16 changes: 8 additions & 8 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,21 +8,21 @@ appdirs==1.4.4
# via fs
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
Expand All @@ -33,9 +33,9 @@ web-fragments==2.2.0
# via
# -r requirements/base.in
# 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
6 changes: 3 additions & 3 deletions requirements/ci.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
#
flake8==7.0.0
flake8==7.1.1
# via -r requirements/ci.in
mccabe==0.7.0
# via flake8
pycodestyle==2.11.1
pycodestyle==2.12.1
# via flake8
pyflakes==3.2.0
# via flake8
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==75.1.0
# 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
16 changes: 5 additions & 11 deletions requirements/test.txt
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
#
# 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[toml]==7.4.4
coverage[toml]==7.6.1
# via pytest-cov
exceptiongroup==1.2.0
# via pytest
iniconfig==2.0.0
# via pytest
packaging==24.0
packaging==24.1
# via pytest
pluggy==1.4.0
pluggy==1.5.0
# via pytest
pytest==8.1.1
pytest==8.3.3
# via pytest-cov
pytest-cov==5.0.0
# via -r requirements/test.in
tomli==2.0.1
# via
# coverage
# pytest
3 changes: 1 addition & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,8 @@ def get_version(file_path):
'Topic :: Software Development :: Build Tools',
'License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.11',
'Programming Language :: Python :: 3.12',
'Programming Language :: Python :: Implementation :: CPython',
],
)