Skip to content

Commit

Permalink
Merge branch 'main' into jenkins/zshkoor/setup-py-updated-56cf018
Browse files Browse the repository at this point in the history
  • Loading branch information
mariajgrimaldi authored Sep 28, 2023
2 parents 79ab187 + 78e3ba5 commit 42c8129
Show file tree
Hide file tree
Showing 10 changed files with 74 additions and 91 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
toxenv: ["py38", "quality", "docs"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
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 @@ -11,7 +11,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
with:
Expand Down
10 changes: 5 additions & 5 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,25 @@ asgiref==3.7.2
# via django
attrs==23.1.0
# via -r requirements/base.in
django==3.2.20
django==3.2.21
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
edx-opaque-keys[django]==2.5.0
edx-opaque-keys[django]==2.5.1
# via -r requirements/base.in
fastavro==1.8.2
fastavro==1.8.3
# via -r requirements/base.in
pbr==5.11.1
# via stevedore
pymongo==3.13.0
# via edx-opaque-keys
pytz==2023.3
pytz==2023.3.post1
# via django
sqlparse==0.4.4
# via django
stevedore==5.1.0
# via edx-opaque-keys
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# asgiref
# edx-opaque-keys
6 changes: 2 additions & 4 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
distlib==0.3.7
# via virtualenv
filelock==3.12.3
filelock==3.12.4
# via
# tox
# virtualenv
Expand All @@ -26,7 +26,5 @@ tox==3.28.0
# via
# -c requirements/common_constraints.txt
# -r requirements/ci.in
typing-extensions==4.7.1
# via filelock
virtualenv==20.24.4
virtualenv==20.24.5
# via tox
49 changes: 21 additions & 28 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,14 @@ asgiref==3.7.2
# via
# -r requirements/quality.txt
# django
astroid==2.15.6
astroid==2.15.7
# via
# -r requirements/quality.txt
# pylint
# pylint-celery
attrs==23.1.0
# via -r requirements/quality.txt
bleach==6.0.0
# via
# -r requirements/quality.txt
# readme-renderer
build==1.0.0
build==1.0.3
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down Expand Up @@ -53,11 +49,11 @@ code-annotations==1.5.0
# via
# -r requirements/quality.txt
# edx-lint
coverage[toml]==7.3.0
coverage[toml]==7.3.1
# via
# -r requirements/quality.txt
# pytest-cov
cryptography==41.0.3
cryptography==41.0.4
# via
# -r requirements/quality.txt
# secretstorage
Expand All @@ -73,7 +69,7 @@ distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
django==3.2.20
django==3.2.21
# via
# -c requirements/common_constraints.txt
# -r requirements/quality.txt
Expand All @@ -83,15 +79,15 @@ docutils==0.20.1
# readme-renderer
edx-lint==5.3.4
# via -r requirements/quality.txt
edx-opaque-keys[django]==2.5.0
edx-opaque-keys[django]==2.5.1
# via -r requirements/quality.txt
exceptiongroup==1.1.3
# via
# -r requirements/quality.txt
# pytest
fastavro==1.8.2
fastavro==1.8.3
# via -r requirements/quality.txt
filelock==3.12.3
filelock==3.12.4
# via
# -r requirements/ci.txt
# tox
Expand All @@ -107,7 +103,7 @@ importlib-metadata==6.8.0
# build
# keyring
# twine
importlib-resources==6.0.1
importlib-resources==6.1.0
# via
# -r requirements/quality.txt
# keyring
Expand Down Expand Up @@ -161,6 +157,10 @@ more-itertools==10.1.0
# via
# -r requirements/quality.txt
# jaraco-classes
nh3==0.2.14
# via
# -r requirements/quality.txt
# readme-renderer
packaging==23.1
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -238,7 +238,7 @@ pyproject-hooks==1.0.0
# via
# -r requirements/pip-tools.txt
# build
pytest==7.4.1
pytest==7.4.2
# via
# -r requirements/quality.txt
# pytest-cov
Expand All @@ -251,15 +251,15 @@ python-slugify==8.0.1
# via
# -r requirements/quality.txt
# code-annotations
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/quality.txt
# django
pyyaml==6.0.1
# via
# -r requirements/quality.txt
# code-annotations
readme-renderer==41.0
readme-renderer==42.0
# via
# -r requirements/quality.txt
# twine
Expand All @@ -276,7 +276,7 @@ rfc3986==2.0.0
# via
# -r requirements/quality.txt
# twine
rich==13.5.2
rich==13.5.3
# via
# -r requirements/quality.txt
# twine
Expand All @@ -288,7 +288,6 @@ six==1.16.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# bleach
# edx-lint
# tox
snowballstemmer==2.2.0
Expand Down Expand Up @@ -333,29 +332,23 @@ tox-battery==0.6.2
# via -r requirements/dev.in
twine==4.0.2
# via -r requirements/quality.txt
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
# asgiref
# astroid
# edx-opaque-keys
# filelock
# pylint
# rich
urllib3==2.0.4
urllib3==2.0.5
# via
# -r requirements/quality.txt
# requests
# twine
virtualenv==20.24.4
virtualenv==20.24.5
# via
# -r requirements/ci.txt
# tox
webencodings==0.5.1
# via
# -r requirements/quality.txt
# bleach
wheel==0.41.2
# via
# -r requirements/pip-tools.txt
Expand All @@ -364,7 +357,7 @@ wrapt==1.15.0
# via
# -r requirements/quality.txt
# astroid
zipp==3.16.2
zipp==3.17.0
# via
# -r requirements/pip-tools.txt
# -r requirements/quality.txt
Expand Down
38 changes: 17 additions & 21 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ babel==2.12.1
# via sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
bleach==6.0.0
# via readme-renderer
build==1.0.0
build==1.0.3
# via -r requirements/doc.in
certifi==2023.7.22
# via requests
Expand All @@ -34,15 +32,15 @@ code-annotations==1.5.0
# via -r requirements/test.txt
colorama==0.4.6
# via sphinx-autobuild
coverage[toml]==7.3.0
coverage[toml]==7.3.1
# via
# -r requirements/test.txt
# pytest-cov
cryptography==41.0.3
cryptography==41.0.4
# via secretstorage
ddt==1.6.0
# via -r requirements/test.txt
django==3.2.20
django==3.2.21
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -55,13 +53,13 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
edx-opaque-keys[django]==2.5.0
edx-opaque-keys[django]==2.5.1
# via -r requirements/test.txt
exceptiongroup==1.1.3
# via
# -r requirements/test.txt
# pytest
fastavro==1.8.2
fastavro==1.8.3
# via -r requirements/test.txt
idna==3.4
# via requests
Expand All @@ -73,7 +71,7 @@ importlib-metadata==6.8.0
# keyring
# sphinx
# twine
importlib-resources==6.0.1
importlib-resources==6.1.0
# via keyring
iniconfig==2.0.0
# via
Expand Down Expand Up @@ -104,6 +102,8 @@ mdurl==0.1.2
# via markdown-it-py
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
# via readme-renderer
packaging==23.1
# via
# -r requirements/test.txt
Expand Down Expand Up @@ -138,7 +138,7 @@ pymongo==3.13.0
# edx-opaque-keys
pyproject-hooks==1.0.0
# via build
pytest==7.4.1
pytest==7.4.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -151,7 +151,7 @@ python-slugify==8.0.1
# via
# -r requirements/test.txt
# code-annotations
pytz==2023.3
pytz==2023.3.post1
# via
# -r requirements/test.txt
# babel
Expand All @@ -161,7 +161,7 @@ pyyaml==6.0.1
# -r requirements/test.txt
# code-annotations
# sphinx-book-theme
readme-renderer==41.0
readme-renderer==42.0
# via twine
requests==2.31.0
# via
Expand All @@ -174,14 +174,12 @@ restructuredtext-lint==1.4.0
# via doc8
rfc3986==2.0.0
# via twine
rich==13.5.2
rich==13.5.3
# via twine
secretstorage==3.3.3
# via keyring
six==1.16.0
# via
# bleach
# livereload
# via livereload
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
Expand Down Expand Up @@ -244,19 +242,17 @@ tornado==6.3.3
# via livereload
twine==4.0.2
# via -r requirements/doc.in
typing-extensions==4.7.1
typing-extensions==4.8.0
# via
# -r requirements/test.txt
# asgiref
# edx-opaque-keys
# rich
urllib3==2.0.4
urllib3==2.0.5
# via
# requests
# twine
webencodings==0.5.1
# via bleach
zipp==3.16.2
zipp==3.17.0
# via
# importlib-metadata
# importlib-resources
4 changes: 2 additions & 2 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# make upgrade
#
build==1.0.0
build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
Expand All @@ -23,7 +23,7 @@ tomli==2.0.1
# pyproject-hooks
wheel==0.41.2
# via pip-tools
zipp==3.16.2
zipp==3.17.0
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.41.2
# The following packages are considered to be unsafe in a requirements file:
pip==23.2.1
# via -r requirements/pip.in
setuptools==68.1.2
setuptools==68.2.2
# via -r requirements/pip.in
Loading

0 comments on commit 42c8129

Please sign in to comment.