Skip to content

Commit

Permalink
Merge branch 'main' into jenkins/zshkoor/setup-py-updated-241d282
Browse files Browse the repository at this point in the history
  • Loading branch information
mariajgrimaldi authored Feb 26, 2024
2 parents 3c878f8 + 072d717 commit 3ac43ea
Show file tree
Hide file tree
Showing 13 changed files with 209 additions and 200 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
toxenv: ["py38", "quality", "docs"]

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pypi-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: setup python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: 3.8

Expand Down
6 changes: 5 additions & 1 deletion .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@
# Required
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "3.8"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/conf.py

python:
version: 3.8
install:
- requirements: requirements/doc.txt
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
asgiref==3.7.2
# via django
django==3.2.21
django==3.2.24
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/base.in
pytz==2023.3.post1
pytz==2024.1
# via django
sqlparse==0.4.4
# via django
typing-extensions==4.7.1
typing-extensions==4.10.0
# via asgiref
38 changes: 23 additions & 15 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,35 @@
#
# make upgrade
#
distlib==0.3.7
cachetools==5.3.2
# via tox
chardet==5.2.0
# via tox
colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.1
# via tox
platformdirs==3.10.0
# via virtualenv
pluggy==1.3.0
# via tox
py==1.11.0
packaging==23.2
# via
# pyproject-api
# tox
platformdirs==4.2.0
# via
# tox
# virtualenv
pluggy==1.4.0
# via tox
six==1.16.0
pyproject-api==1.6.1
# via tox
tomli==2.0.1
# via tox
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/ci.in
virtualenv==20.24.5
# pyproject-api
# tox
tox==4.13.0
# via -r requirements/ci.in
virtualenv==20.25.1
# via tox
1 change: 0 additions & 1 deletion requirements/dev.in
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@
-r ci.txt # dependencies needed to setup testing environment on CI

diff-cover # Changeset diff test coverage
tox-battery # Makes tox aware of requirements file changes
Loading

0 comments on commit 3ac43ea

Please sign in to comment.