Skip to content

Commit

Permalink
Merge branch 'main' into sameeramin/ENT-9811
Browse files Browse the repository at this point in the history
  • Loading branch information
sameeramin committed Jan 6, 2025
2 parents 2e91618 + a5c8175 commit 8456213
Show file tree
Hide file tree
Showing 16 changed files with 89 additions and 82 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest]
python-version: ['3.8']
toxenv: [quality, docs, pii_check, django32, django40]
python-version: ['3.11']
toxenv: [quality, docs, pii_check, django42]

steps:
- uses: actions/checkout@v3
Expand All @@ -37,7 +37,7 @@ jobs:
run: tox

- name: Run coverage
if: matrix.python-version == '3.8' && matrix.toxenv == 'django32'
if: matrix.python-version == '3.11' && matrix.toxenv == 'django42'
uses: codecov/codecov-action@v4
with:
token: ${{ secrets.CODECOV_TOKEN }}
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 @@ -14,7 +14,7 @@ jobs:
- name: setup python
uses: actions/setup-python@v5
with:
python-version: 3.12
python-version: 3.11

- name: Install pip
run: pip install -r requirements/pip.txt
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/upgrade-python-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ jobs:
team_reviewers: "2u-iris"
email_address: [email protected]
send_success_notification: false
python_version: "3.11"
secrets:
requirements_bot_github_token: ${{ secrets.REQUIREMENTS_BOT_GITHUB_TOKEN }}
requirements_bot_github_email: ${{ secrets.REQUIREMENTS_BOT_GITHUB_EMAIL }}
Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
enterprise-integrated-channels
#############################
##############################

.. note::

Expand Down
5 changes: 4 additions & 1 deletion channel_integrations/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
"""
An integrated channel is an abstraction meant to represent a third-party system which provides an API that can be used to transmit EdX data to the third-party system.
API bridge for EdX.
An integrated channel is an abstraction meant to represent a third-party system
which provides an API that can be used to transmit EdX data to the third-party system.
"""

__version__ = '0.1.0'
2 changes: 1 addition & 1 deletion manage.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# issue is really that Django is missing to avoid masking other
# exceptions on Python 2.
try:
import django # pylint: disable=unused-import, wrong-import-position
import django # pylint: disable=unused-import
except ImportError as import_error:
raise ImportError(
"Couldn't import Django. Are you sure it's installed and "
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#
# 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
#
asgiref==3.8.1
# via django
django==4.2.16
django==4.2.17
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
openedx-atlas==0.6.2
# via -r requirements/base.in
sqlparse==0.5.1
sqlparse==0.5.3
# via django
6 changes: 3 additions & 3 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 @@ -16,7 +16,7 @@ filelock==3.16.1
# via
# tox
# virtualenv
packaging==24.1
packaging==24.2
# via
# pyproject-api
# tox
Expand All @@ -30,5 +30,5 @@ pyproject-api==1.8.0
# via tox
tox==4.23.2
# via -r requirements/ci.in
virtualenv==20.27.1
virtualenv==20.28.1
# via tox
34 changes: 17 additions & 17 deletions requirements/dev.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 @@ -8,7 +8,7 @@ asgiref==3.8.1
# via
# -r requirements/quality.txt
# django
astroid==3.3.5
astroid==3.3.8
# via
# -r requirements/quality.txt
# pylint
Expand All @@ -26,7 +26,7 @@ chardet==5.2.0
# -r requirements/ci.txt
# diff-cover
# tox
click==8.1.7
click==8.1.8
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand All @@ -38,19 +38,19 @@ click-log==0.4.0
# via
# -r requirements/quality.txt
# edx-lint
code-annotations==1.8.0
code-annotations==2.1.0
# via
# -r requirements/quality.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.6.4
coverage[toml]==7.6.10
# via
# -r requirements/quality.txt
# pytest-cov
diff-cover==9.2.0
diff-cover==9.2.1
# via -r requirements/dev.in
dill==0.3.9
# via
Expand All @@ -60,7 +60,7 @@ distlib==0.3.9
# via
# -r requirements/ci.txt
# virtualenv
django==4.2.16
django==4.2.17
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
Expand All @@ -82,7 +82,7 @@ isort==5.13.2
# via
# -r requirements/quality.txt
# pylint
jinja2==3.1.4
jinja2==3.1.5
# via
# -r requirements/quality.txt
# code-annotations
Expand All @@ -91,7 +91,7 @@ lxml[html-clean,html_clean]==5.3.0
# via
# edx-i18n-tools
# lxml-html-clean
lxml-html-clean==0.3.1
lxml-html-clean==0.4.1
# via lxml
markupsafe==3.0.2
# via
Expand All @@ -103,7 +103,7 @@ mccabe==0.7.0
# pylint
openedx-atlas==0.6.2
# via -r requirements/quality.txt
packaging==24.1
packaging==24.2
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -142,7 +142,7 @@ pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.18.0
# via diff-cover
pylint==3.3.1
pylint==3.3.3
# via
# -r requirements/quality.txt
# edx-lint
Expand Down Expand Up @@ -171,7 +171,7 @@ pyproject-hooks==1.2.0
# -r requirements/pip-tools.txt
# build
# pip-tools
pytest==8.3.3
pytest==8.3.4
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -189,19 +189,19 @@ pyyaml==6.0.2
# -r requirements/quality.txt
# code-annotations
# edx-i18n-tools
six==1.16.0
six==1.17.0
# via
# -r requirements/quality.txt
# edx-lint
snowballstemmer==2.2.0
# via
# -r requirements/quality.txt
# pydocstyle
sqlparse==0.5.1
sqlparse==0.5.3
# via
# -r requirements/quality.txt
# django
stevedore==5.3.0
stevedore==5.4.0
# via
# -r requirements/quality.txt
# code-annotations
Expand All @@ -215,11 +215,11 @@ tomlkit==0.13.2
# pylint
tox==4.23.2
# via -r requirements/ci.txt
virtualenv==20.27.1
virtualenv==20.28.1
# via
# -r requirements/ci.txt
# tox
wheel==0.44.0
wheel==0.45.1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
43 changes: 23 additions & 20 deletions requirements/doc.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,25 +16,27 @@ babel==2.16.0
# via
# pydata-sphinx-theme
# sphinx
backports-tarfile==1.2.0
# via jaraco-context
beautifulsoup4==4.12.3
# via pydata-sphinx-theme
build==1.2.2.post1
# via -r requirements/doc.in
certifi==2024.8.30
certifi==2024.12.14
# via requests
charset-normalizer==3.4.0
charset-normalizer==3.4.1
# via requests
click==8.1.7
click==8.1.8
# via
# -r requirements/test.txt
# code-annotations
code-annotations==1.8.0
code-annotations==2.1.0
# via -r requirements/test.txt
coverage[toml]==7.6.4
coverage[toml]==7.6.10
# via
# -r requirements/test.txt
# pytest-cov
django==4.2.16
django==4.2.17
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -52,7 +54,7 @@ idna==3.10
imagesize==1.4.1
# via sphinx
importlib-metadata==8.5.0
# via twine
# via keyring
iniconfig==2.0.0
# via
# -r requirements/test.txt
Expand All @@ -63,12 +65,12 @@ jaraco-context==6.0.1
# via keyring
jaraco-functools==4.1.0
# via keyring
jinja2==3.1.4
jinja2==3.1.5
# via
# -r requirements/test.txt
# code-annotations
# sphinx
keyring==25.5.0
keyring==25.6.0
# via twine
markdown-it-py==3.0.0
# via rich
Expand All @@ -82,27 +84,28 @@ more-itertools==10.5.0
# via
# jaraco-classes
# jaraco-functools
nh3==0.2.18
nh3==0.2.20
# via readme-renderer
openedx-atlas==0.6.2
# via -r requirements/test.txt
packaging==24.1
packaging==24.2
# via
# -r requirements/test.txt
# build
# pytest
# sphinx
# twine
pbr==6.1.0
# via
# -r requirements/test.txt
# stevedore
pkginfo==1.10.0
pkginfo==1.12.0
# via twine
pluggy==1.5.0
# via
# -r requirements/test.txt
# pytest
pydata-sphinx-theme==0.16.0
pydata-sphinx-theme==0.16.1
# via sphinx-book-theme
pygments==2.18.0
# via
Expand All @@ -114,7 +117,7 @@ pygments==2.18.0
# sphinx
pyproject-hooks==1.2.0
# via build
pytest==8.3.3
pytest==8.3.4
# via
# -r requirements/test.txt
# pytest-cov
Expand Down Expand Up @@ -169,11 +172,11 @@ sphinxcontrib-qthelp==2.0.0
# via sphinx
sphinxcontrib-serializinghtml==2.0.0
# via sphinx
sqlparse==0.5.1
sqlparse==0.5.3
# via
# -r requirements/test.txt
# django
stevedore==5.3.0
stevedore==5.4.0
# via
# -r requirements/test.txt
# code-annotations
Expand All @@ -182,13 +185,13 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
twine==5.1.1
twine==6.0.1
# via -r requirements/doc.in
typing-extensions==4.12.2
# via pydata-sphinx-theme
urllib3==2.2.3
urllib3==2.3.0
# via
# requests
# twine
zipp==3.20.2
zipp==3.21.0
# via importlib-metadata
Loading

0 comments on commit 8456213

Please sign in to comment.