Skip to content
Open
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
4 changes: 1 addition & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@

**Post merge:**
- [ ] Tag pushed and a new [version](https://github.com/openedx/edx-enterprise-data/releases) released
- *Note*: Assets will be added automatically. You just need to provide a tag (should match your version number) and title and description.
- [ ] After versioned build finishes in [Travis](https://travis-ci.org/github/edx/edx-enterprise-data), verify version has been pushed to [PyPI](https://pypi.org/project/edx-enterprise-data/)
- Each step in the release build has a condition flag that checks if the rest of the steps are done and if so will deploy to PyPi.
- [ ] After the [PyPI publish action](https://github.com/openedx/edx-enterprise-data/actions/workflows/pypi-publish.yml) finishes, verify version has been pushed to [PyPI](https://pypi.org/project/edx-enterprise-data/)
(so basically once your build finishes, after maybe a minute you should see the new version in PyPi automatically (on refresh))
- [ ] PR created in [edx-analytics-data-api](https://github.com/openedx/edx-analytics-data-api) to upgrade dependencies (including edx-enterprise-data)
- This **must** be done after the version is visible in PyPi as `make upgrade` in edx-analytics-data-api will look for the latest version in PyPi.
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Change Log
.. There should always be an "Unreleased" section for changes pending release.

Unreleased
----------
* Nothing

10.22.15
--------
* build: upgrade python dependencies, add pylintrc `pii_terms` directive

[10.22.14] - 2026-08-06
-----------------------
Expand Down
2 changes: 1 addition & 1 deletion enterprise_data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Enterprise data api application. This Django app exposes API endpoints used by enterprises.
"""

__version__ = "10.22.14"
__version__ = "10.22.15"
11 changes: 9 additions & 2 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.7
# Generated by edx-lint version: 6.2.0
# ------------------------------
[MASTER]
ignore = migrations
Expand Down Expand Up @@ -258,6 +258,8 @@ enable =
deprecated-pragma,
unrecognized-inline-option,
useless-suppression,

pii-invalid-no-pii-annotation,
disable =
bad-indentation,
broad-exception-raised,
Expand Down Expand Up @@ -387,4 +389,9 @@ int-import-graph =
[EXCEPTIONS]
overgeneral-exceptions = builtins.Exception

# 6f91f954987bf8dc98d080a134265c4957dae66f
[PII]
pii-terms =
email,
username

# d13af1c0d4732de9f847ebff6a1fc19d6fd5a237
26 changes: 13 additions & 13 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.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -16,11 +16,11 @@ bcrypt==5.0.0
# via paramiko
billiard==4.2.4
# via celery
boto3==1.43.66
boto3==1.43.79
# via
# -r requirements/reporting.in
# snowflake-connector-python
botocore==1.43.66
botocore==1.43.79
# via
# boto3
# s3transfer
Expand All @@ -36,7 +36,7 @@ cffi==2.1.1
# via
# cryptography
# pynacl
charset-normalizer==3.4.9
charset-normalizer==3.5.1
# via
# requests
# snowflake-connector-python
Expand Down Expand Up @@ -113,7 +113,7 @@ edx-django-utils==8.0.1
# -r requirements/base.in
# edx-drf-extensions
# edx-rest-api-client
edx-drf-extensions==10.6.0
edx-drf-extensions==10.7.0
# via
# -r requirements/base.in
# edx-rbac
Expand All @@ -127,11 +127,11 @@ edx-rest-api-client==7.0.0
# via -r requirements/base.in
factory-boy==3.3.3
# via -r requirements/base.in
faker==40.36.0
faker==40.37.0
# via factory-boy
filelock==3.32.2
filelock==3.32.4
# via snowflake-connector-python
idna==3.18
idna==3.19
# via
# requests
# snowflake-connector-python
Expand Down Expand Up @@ -165,7 +165,7 @@ pgpy==0.6.0
# via -r requirements/reporting.in
pillow==12.3.0
# via pansi
platformdirs==4.11.0
platformdirs==4.11.4
# via snowflake-connector-python
prompt-toolkit==3.0.53
# via click-repl
Expand All @@ -179,7 +179,7 @@ pyasn1==0.6.4
# rsa
pycparser==3.0
# via cffi
pygments==2.20.0
pygments==2.21.0
# via py2neo
pyjwt[crypto]==2.13.0
# via
Expand Down Expand Up @@ -230,15 +230,15 @@ six==1.17.0
# py2neo
# python-dateutil
# vertica-python
snowflake-connector-python==4.7.1
snowflake-connector-python==4.7.2
# via
# -r requirements/base.in
# -r requirements/reporting.in
sortedcontainers==2.4.0
# via snowflake-connector-python
sqlparse==0.5.5
sqlparse==0.6.0
# via django
stevedore==5.9.0
stevedore==5.9.1
# via
# edx-django-utils
# edx-opaque-keys
Expand Down
14 changes: 8 additions & 6 deletions requirements/ci.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.12
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -12,7 +12,7 @@ coverage==7.15.4
# via -r requirements/ci.in
distlib==0.4.3
# via virtualenv
filelock==3.32.2
filelock==3.32.4
# via
# python-discovery
# tox
Expand All @@ -21,21 +21,23 @@ packaging==26.3
# via
# pyproject-api
# tox
platformdirs==4.11.0
platformdirs==4.11.4
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
pyproject-api==1.11.0
# via tox
python-discovery==1.5.1
python-discovery==1.5.3
# via
# tox
# virtualenv
tomli-w==1.2.0
# via tox
tox==4.58.0
tox==4.60.1
# via -r requirements/ci.in
virtualenv==21.7.1
typing-extensions==4.16.0
# via tox
virtualenv==21.7.5
# via tox
17 changes: 17 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,20 @@ elasticsearch<7.14.0
# Tracking issue: https://github.com/openedx/edx-drf-extensions/issues/561
social-auth-app-django<6.0.0
social-auth-core<5.0.0

# 2026-08-11: pip-tools is only tested against the latest pip released at the time
# pip-tools was released; also, pip-tools package dependencies are extremely permissive
# about the pip version required, so the dependency resolver will not prevent an unwanted
# pip upgrade which would break pip-tools. The end result is that pip MUST be constrained
# by all pip-tools users in order to avoid potentially weeks-long lapses in pip <->
# pip-tools compatibility. We've constrained pip here in common_constraints.txt in the
# past, but always removed it once the issue was "fixed". Removing this constraint was
# always a mistake.
#
# This is a semi-permanent constraint and should be manually bumped after each pip-tools
# release.
#
# Exceptional conditions for removal:
# - We stop using pip-tools, OR
# - We migrate to the proposed `pip-tools[stable]` extra: https://github.com/jazzband/pip-tools/pull/2257
pip<26.2.1 # Known to work with pip-tools==7.6.1
Comment on lines +29 to +44

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This is now pinned in edx-lint as part of the 6.2.0 upgrade and can now be removed from individual repos.
PR: openedx/edx-lint#564

14 changes: 14 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,17 @@ mysql-connector-python<9.6
# tox env. Pin below the breaking release until this repo drops Django 4.2.
# https://pypi.org/project/pytest-django/4.13.0/#history
pytest-django<4.13.0

# django-simple-history 3.13.0+ dropped support for Django 4.2, incompatible with existing tests
# Keep at 3.12.0 for Django 4.2 compatibility
django-simple-history<3.13.0

# pip 26.2+ is incompatible with pip-tools 7.6.0 (latest pip-tools release only
# supports pip up to 26.1), which breaks `make upgrade`. Remove this once a
# newer pip-tools release restores pip 26.2+ compatibility.
pip<26.2

# Pin pip-tools to the version verified compatible with the pip<26.2 constraint
# above; a newer pip-tools release could require a newer pip and reintroduce
# the `make upgrade` breakage this constraint set was added to fix.
pip-tools==7.6.0
Comment on lines +35 to +43

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Pinning pip-tools is no longer required, and these 2 constraints can be removed. The reasoning why pip-tools can be unpinned alludes me.
See this edx-lint PR for more context why: openedx/edx-lint#564 (comment)

Loading
Loading