Skip to content

Commit

Permalink
Merge branch 'master' into swagger2rst
Browse files Browse the repository at this point in the history
  • Loading branch information
Irtaza Akram authored and Irtaza Akram committed Jan 10, 2024
2 parents e52bbbc + a0e003e commit 0ddddac
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install pip
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: Checkout
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.3.2
coverage[toml]==7.3.3
# via
# -r requirements/test.txt
# coverage
Expand Down
14 changes: 13 additions & 1 deletion requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ celery==5.3.6
# -r requirements/base.txt
certifi==2023.11.17
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.2
# via requests
click==8.1.7
Expand Down Expand Up @@ -71,6 +73,8 @@ coreschema==0.0.4
# via coreapi
deepmerge==1.1.0
# via sphinxcontrib-openapi
cryptography==41.0.7
# via secretstorage
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
Expand Down Expand Up @@ -121,6 +125,10 @@ itypes==1.2.0
# via coreapi
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via
# coreschema
Expand Down Expand Up @@ -167,6 +175,8 @@ prompt-toolkit==3.0.43
# via
# -r requirements/base.txt
# click-repl
pycparser==2.21
# via cffi
pydata-sphinx-theme==0.14.4
# via sphinx-book-theme
pygments==2.17.2
Expand Down Expand Up @@ -214,12 +224,14 @@ rfc3986==2.0.0
# via twine
rich==13.7.0
# via twine
rpds-py==0.13.2
rpds-py==0.15.2
# via
# jsonschema
# referencing
rules==3.3
# via -r requirements/doc.in
secretstorage==3.3.3
# via keyring
simplejson==3.19.2
# via django-rest-swagger
six==1.16.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ wheel==0.42.0
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==23.3.1
pip==23.3.2
# via -r requirements/pip.in
setuptools==69.0.2
# via -r requirements/pip.in
2 changes: 1 addition & 1 deletion requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ click-repl==0.3.0
# via
# -r requirements/base.txt
# celery
coverage[toml]==7.3.2
coverage[toml]==7.3.3
# via
# coverage
# pytest-cov
Expand Down

0 comments on commit 0ddddac

Please sign in to comment.