Skip to content
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
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ Unreleased
----------
* Nothing

[6.1.0]
-------
- Updated Python requirement files with `Python 3.11`.
- Dropped support for `Python 3.8` from `tox.ini`.
- Bumped the package version to `6.1.0`.

[6.0.0]
-------
* Breaking Change: The EdxRestApiClient` has been deprecated and removed in this release.
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,10 @@ $(COMMON_CONSTRAINTS_TXT):
export CUSTOM_COMPILE_COMMAND = make upgrade
compile-requirements: piptools $(COMMON_CONSTRAINTS_TXT) ## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
# Make sure to compile files after any other files they include!
sed '/^importlib-metadata</d' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile ${COMPILE_OPTS} --allow-unsafe --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile ${COMPILE_OPTS} --allow-unsafe --verbose --rebuild -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
sed 's/Django<4.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip-compile ${COMPILE_OPTS} --allow-unsafe --verbose --rebuild -o requirements/base.txt requirements/base.in
pip-compile ${COMPILE_OPTS} --allow-unsafe --verbose --rebuild -o requirements/test.txt requirements/test.in
pip-compile ${COMPILE_OPTS} --allow-unsafe --verbose --rebuild -o requirements/dev.txt requirements/dev.in
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ The edX REST API Client simplifies communicating with other Open edX services by
Getting Started with Development
********************************

In a Python 3.8 virtual environment:
In a Python 3.11 virtual environment:

.. code-block:: shell

Expand Down
10 changes: 6 additions & 4 deletions pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# SERIOUSLY.
#
# ------------------------------
# Generated by edx-lint version: 5.3.0
# Generated by edx-lint version: 5.4.1
# ------------------------------
[MASTER]
ignore =
Expand Down Expand Up @@ -259,6 +259,7 @@ enable =
useless-suppression,
disable =
bad-indentation,
broad-exception-raised,
consider-using-f-string,
duplicate-code,
file-ignored,
Expand Down Expand Up @@ -288,7 +289,8 @@ disable =
logging-fstring-interpolation,
missing-docstring,
consider-using-f-string,
missing-timeout
missing-timeout,
too-many-positional-arguments

[REPORTS]
output-format = text
Expand Down Expand Up @@ -383,6 +385,6 @@ ext-import-graph =
int-import-graph =

[EXCEPTIONS]
overgeneral-exceptions = Exception
overgeneral-exceptions = builtins.Exception

# 7e4ff98bbab6f2faf3fa2b6ceff3f5ba70713a31
# 1cd25098a0ed6e5e6b5c6b52acb7517fe98154da
3 changes: 2 additions & 1 deletion pylintrc_tweaks
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ load-plugins = edx_lint.pylint
DISABLE+=
missing-docstring,
consider-using-f-string,
missing-timeout
missing-timeout,
too-many-positional-arguments

[TYPECHECK]
ignored-classes+= ,responses
28 changes: 14 additions & 14 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,45 +6,45 @@
#
asgiref==3.8.1
# via django
certifi==2024.8.30
certifi==2025.1.31
# via requests
cffi==1.17.1
# via pynacl
charset-normalizer==3.3.2
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via edx-django-utils
django==4.2.16
django==4.2.18
# via
# -c requirements/common_constraints.txt
# -c /Users/usama.sadiq/Desktop/openedx/edx-rest-api-client/requirements/common_constraints.txt
# django-crum
# django-waffle
# edx-django-utils
django-crum==0.7.9
# via edx-django-utils
django-waffle==4.1.0
django-waffle==4.2.0
# via edx-django-utils
edx-django-utils==5.15.0
edx-django-utils==7.1.0
# via -r requirements/base.in
idna==3.8
idna==3.10
# via requests
newrelic==9.13.0
newrelic==10.5.0
# via edx-django-utils
pbr==6.1.0
# via stevedore
psutil==6.0.0
psutil==6.1.1
# via edx-django-utils
pycparser==2.22
# via cffi
pyjwt==2.9.0
pyjwt==2.10.1
# via -r requirements/base.in
pynacl==1.5.0
# via edx-django-utils
requests==2.32.3
# via -r requirements/base.in
sqlparse==0.5.1
sqlparse==0.5.3
# via django
stevedore==5.3.0
stevedore==5.4.0
# via edx-django-utils
urllib3==2.2.2
urllib3==2.3.0
# via requests
17 changes: 8 additions & 9 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,31 @@
#
# make upgrade
#
cachetools==5.5.0
cachetools==5.5.1
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
distlib==0.3.9
# via virtualenv
filelock==3.15.4
filelock==3.17.0
# via
# tox
# virtualenv
packaging==23.2
packaging==24.2
# via
# -c requirements/constraints.txt
# pyproject-api
# tox
platformdirs==4.2.2
platformdirs==4.3.6
# via
# tox
# virtualenv
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
pyproject-api==1.9.0
# via tox
tox==4.15.1
tox==4.24.1
# via -r requirements/ci.in
virtualenv==20.26.3
virtualenv==20.29.1
# via tox
20 changes: 20 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,26 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand Down
6 changes: 0 additions & 6 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,3 @@

# Common constraints for edx repos
-c common_constraints.txt

backports.zoneinfo;python_version<"3.9"

# Temporary pins to avoid conflicts
packaging==23.2
zipp==3.17.0
Loading