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
Binary file added .coverage-journal
Binary file not shown.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version:
- '3.11'
python-version: ['3.11']
toxenv: [quality, docs, django42-celery53, pii_check]
env:
RUNJSHINT: true
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: x64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/mysql8-migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ 3.8 ]
python-version: ['3.11']

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/postgresql-migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ jobs:
strategy:
matrix:
os: [ ubuntu-latest ]
python-version: [ 3.11 ]
python-version: ['3.11']

steps:
- name: Checkout repo
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Setup Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Setup Nodejs Env
run: echo "NODE_VER=`cat .nvmrc`" >> $GITHUB_ENV
- name: setup python
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.11
- name: Setup Node.js
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ Unreleased
----------
* nothing unreleased

[6.0.0]
--------
* chore: add python 3.12 support and drop python 3.8 support

[5.13.7]
---------
* feat: adds ENTERPRISE_ADMIN_ONBOARDING toggle, removes obsolete groups toggles
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ MAINTAINER sre@edx.org
RUN apt-get update && apt-get -qy install --no-install-recommends \
language-pack-en \
locales \
python3.8 \
python3.11 \
python3-pip \
python3.8-venv \
python3.11-venv \
pkg-config \
libmysqlclient-dev \
libssl-dev \
Expand Down
2 changes: 1 addition & 1 deletion enterprise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
Your project description goes here.
"""

__version__ = "5.13.7"
__version__ = "6.0.0"
2 changes: 1 addition & 1 deletion enterprise/management/commands/manufacture_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def run_from_argv(self, argv):

Uses ``parse_known_args`` instead of ``parse_args`` to not throw an error when encountering unknown arguments

https://docs.python.org/3.8/library/argparse.html#argparse.ArgumentParser.parse_known_args
https://docs.python.org/3.11/library/argparse.html#argparse.ArgumentParser.parse_known_args
"""
self._called_from_command_line = True
parser = self.create_parser(argv[0], argv[1])
Expand Down
2 changes: 1 addition & 1 deletion integrated_channels/degreed2/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def fetch_degreed_course_id(self, external_id):
LOGGER.info(self.make_log_msg(external_id, f'Found cached course id: {cached_course_id.value}'))
return cached_course_id.value
# QueryDict converts + to space
params = QueryDict(f"filter[external_id]={external_id.replace('+','%2B')}")
params = QueryDict(f"filter[external_id]={external_id.replace('+', '%2B')}")
course_search_url = f'{self.get_courses_url()}?{params.urlencode(safe="[]")}'
LOGGER.info(self.make_log_msg(external_id, f'Attempting find course via url: {course_search_url}'))
status_code, response_body = self._get(
Expand Down
26 changes: 16 additions & 10 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,31 @@
#
# make upgrade
#
cachetools==5.5.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.9
# via virtualenv
filelock==3.18.0
# via
# tox
# virtualenv
packaging==25.0
# via tox
# via
# pyproject-api
# tox
platformdirs==4.3.8
# via virtualenv
pluggy==1.5.0
# via tox
py==1.11.0
# via
# tox
# virtualenv
pluggy==1.6.0
# via tox
six==1.17.0
pyproject-api==1.9.1
# via tox
tox==3.28.0
# via
# -c /home/runner/work/edx-enterprise/edx-enterprise/requirements/constraints.txt
# -r requirements/ci.in
tox==4.26.0
# via -r requirements/ci.in
virtualenv==20.31.2
# via tox
6 changes: 0 additions & 6 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,5 @@ pytest<7.0
# pinning it to latest release.
celery>=5.2.2,<6.0.0

# tox>=4.4.11 require filelock>=3.10.7, which is not yet compatible.
tox<4

# upgrading django-simple-history
django-simple-history<=3.1.1

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
Loading