Skip to content

Commit

Permalink
Merge pull request #96 from openedx/remove-tox-battery-requirement
Browse files Browse the repository at this point in the history
fix: remove tox-battery requirement
  • Loading branch information
UsamaSadiq authored Dec 11, 2023
2 parents 9148d94 + 71f683c commit 764c306
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 66 deletions.
19 changes: 19 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# .readthedocs.yml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

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

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

python:
install:
- requirements: requirements/doc.txt
2 changes: 1 addition & 1 deletion requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jinja2==3.1.2
# via -r requirements/base.in
markupsafe==2.1.3
# via jinja2
pbr==5.11.1
pbr==6.0.0
# via stevedore
python-slugify==8.0.1
# via -r requirements/base.in
Expand Down
1 change: 0 additions & 1 deletion requirements/ci.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
-c constraints.txt

tox # Virtualenv management for tests
tox-battery # Makes tox aware of requirements file changes
10 changes: 3 additions & 7 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
#
distlib==0.3.7
# via virtualenv
filelock==3.12.4
filelock==3.13.1
# via
# tox
# virtualenv
packaging==23.2
# via tox
platformdirs==3.11.0
platformdirs==4.1.0
# via virtualenv
pluggy==1.3.0
# via tox
Expand All @@ -24,11 +24,7 @@ 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
# -c requirements/constraints.txt
# -r requirements/ci.in
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.in
virtualenv==20.24.6
virtualenv==20.25.0
# via tox
26 changes: 11 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ coverage[toml]==7.3.2
# -r requirements/quality.txt
# coverage
# pytest-cov
diff-cover==8.0.0
diff-cover==8.0.1
# via -r requirements/dev.in
dill==0.3.7
# via
Expand All @@ -50,22 +50,22 @@ distlib==0.3.7
# via
# -r requirements/ci.txt
# virtualenv
django==3.2.22
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/quality.txt
edx-lint==5.3.6
# via -r requirements/quality.txt
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via
# -r requirements/quality.txt
# pytest
filelock==3.12.4
filelock==3.13.1
# via
# -r requirements/ci.txt
# tox
# virtualenv
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# -r requirements/pip-tools.txt
# build
Expand Down Expand Up @@ -100,13 +100,13 @@ packaging==23.2
# build
# pytest
# tox
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/quality.txt
# stevedore
pip-tools==7.3.0
# via -r requirements/pip-tools.txt
platformdirs==3.11.0
platformdirs==4.1.0
# via
# -r requirements/ci.txt
# -r requirements/quality.txt
Expand All @@ -127,7 +127,7 @@ pycodestyle==2.11.1
# via -r requirements/quality.txt
pydocstyle==6.3.0
# via -r requirements/quality.txt
pygments==2.16.1
pygments==2.17.2
# via diff-cover
pylint==3.0.2
# via
Expand Down Expand Up @@ -205,29 +205,25 @@ tomli==2.0.1
# pyproject-hooks
# pytest
# tox
tomlkit==0.12.1
tomlkit==0.12.3
# via
# -r requirements/quality.txt
# pylint
tox==3.28.0
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -c requirements/constraints.txt
# -r requirements/ci.txt
# tox-battery
tox-battery==0.6.2
# via -r requirements/ci.txt
typing-extensions==4.8.0
# via
# -r requirements/quality.txt
# asgiref
# astroid
# pylint
virtualenv==20.24.6
virtualenv==20.25.0
# via
# -r requirements/ci.txt
# tox
wheel==0.41.2
wheel==0.42.0
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
2 changes: 1 addition & 1 deletion requirements/django.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
asgiref==3.7.2
# via django
django==3.2.22
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/django.in
Expand Down
40 changes: 14 additions & 26 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ babel==2.13.1
# sphinx
beautifulsoup4==4.12.2
# via pydata-sphinx-theme
certifi==2023.7.22
certifi==2023.11.17
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.1
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via -r requirements/test.txt
Expand All @@ -31,9 +29,7 @@ coverage[toml]==7.3.2
# -r requirements/test.txt
# coverage
# pytest-cov
cryptography==41.0.5
# via secretstorage
django==3.2.22
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
Expand All @@ -46,36 +42,32 @@ docutils==0.19
# readme-renderer
# restructuredtext-lint
# sphinx
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
# pytest
idna==3.4
idna==3.6
# via requests
imagesize==1.4.1
# via sphinx
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via
# keyring
# sphinx
# twine
importlib-resources==6.1.0
importlib-resources==6.1.1
# via keyring
iniconfig==2.0.0
# via
# -r requirements/test.txt
# pytest
jaraco-classes==3.3.0
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.2
# via
# -r requirements/test.txt
# sphinx
keyring==24.2.0
keyring==24.3.0
# via twine
markdown-it-py==3.0.0
# via rich
Expand All @@ -89,15 +81,15 @@ mock==5.1.0
# via -r requirements/test.txt
more-itertools==10.1.0
# via jaraco-classes
nh3==0.2.14
nh3==0.2.15
# via readme-renderer
packaging==23.2
# via
# -r requirements/test.txt
# pydata-sphinx-theme
# pytest
# sphinx
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
Expand All @@ -107,11 +99,9 @@ pluggy==1.3.0
# via
# -r requirements/test.txt
# pytest
pycparser==2.21
# via cffi
pydata-sphinx-theme==0.14.2
pydata-sphinx-theme==0.14.4
# via sphinx-book-theme
pygments==2.16.1
pygments==2.17.2
# via
# accessible-pygments
# doc8
Expand Down Expand Up @@ -147,10 +137,8 @@ restructuredtext-lint==1.4.0
# via doc8
rfc3986==2.0.0
# via twine
rich==13.6.0
rich==13.7.0
# via twine
secretstorage==3.3.3
# via keyring
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
Expand Down Expand Up @@ -200,7 +188,7 @@ typing-extensions==4.8.0
# asgiref
# pydata-sphinx-theme
# rich
urllib3==2.0.7
urllib3==2.1.0
# via
# requests
# twine
Expand Down
8 changes: 4 additions & 4 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
build==1.0.3
# via pip-tools
click==8.1.7
# via pip-tools
importlib-metadata==6.8.0
importlib-metadata==7.0.0
# via build
packaging==23.2
# via build
Expand All @@ -21,7 +21,7 @@ tomli==2.0.1
# build
# pip-tools
# pyproject-hooks
wheel==0.41.2
wheel==0.42.0
# via pip-tools
zipp==3.17.0
# via importlib-metadata
Expand Down
8 changes: 4 additions & 4 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
#
# This file is autogenerated by pip-compile with python 3.8
# To update, run:
# This file is autogenerated by pip-compile with Python 3.8
# by the following command:
#
# make upgrade
#
wheel==0.41.2
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
# via -r requirements/pip.in
setuptools==68.2.2
setuptools==69.0.2
# via -r requirements/pip.in
10 changes: 5 additions & 5 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ coverage[toml]==7.3.2
# pytest-cov
dill==0.3.7
# via pylint
django==3.2.22
django==3.2.23
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/quality.in
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via
# -r requirements/test.txt
# pytest
Expand Down Expand Up @@ -63,11 +63,11 @@ packaging==23.2
# via
# -r requirements/test.txt
# pytest
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==3.11.0
platformdirs==4.1.0
# via pylint
pluggy==1.3.0
# via
Expand Down Expand Up @@ -131,7 +131,7 @@ tomli==2.0.1
# coverage
# pylint
# pytest
tomlkit==0.12.1
tomlkit==0.12.3
# via pylint
typing-extensions==4.8.0
# via
Expand Down
4 changes: 2 additions & 2 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ coverage[toml]==7.3.2
# via
# -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt
# -r requirements/django.txt
exceptiongroup==1.1.3
exceptiongroup==1.2.0
# via pytest
iniconfig==2.0.0
# via pytest
Expand All @@ -31,7 +31,7 @@ mock==5.1.0
# via -r requirements/test.in
packaging==23.2
# via pytest
pbr==5.11.1
pbr==6.0.0
# via
# -r requirements/base.txt
# stevedore
Expand Down

0 comments on commit 764c306

Please sign in to comment.