Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update docutils & Sphinx constraints #31152

Merged
merged 4 commits into from
Oct 14, 2022
Merged

Update docutils & Sphinx constraints #31152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
161bca6
fix: remove sphinx and docutils constraint
UsamaSadiq Oct 13, 2022
5636f07
chore: Updating Python Requirements
edx-requirements-bot Oct 13, 2022
f371c66
fix: pin docutils<0.19 version
UsamaSadiq Oct 13, 2022
c7f832e
fix: update constraint description
UsamaSadiq Oct 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions requirements/constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ py2neo<2022
# pylint==2.14.0 is causing test failures
pylint==2.13.9

# Sphinx requires docutils<0.18. This pin can be removed once https://github.com/sphinx-doc/sphinx/issues/9777 is closed.
docutils<0.18
# Sphinx docs build fails with new version. Will be fixed in https://github.com/openedx/public-engineering/issues/161
sphinx<5.1.0

# scipy version 1.8 requires numpy>=1.17.3, we've pinned numpy to <1.17.0 in requirements/edx-sandbox/py38.in
scipy<1.8.0

Expand Down Expand Up @@ -101,3 +96,7 @@ pytz==2022.2.1
# openedx-events>0.13.0 causes test failures due to breaking changes
# These broken tests will be fixed in a separate PR
openedx-events==0.13.0

# docutils==0.19 has removed the docutils.core.ErrorString which is required by the sphinxcontrib-openapi
# This constraint can be removed once sphinxcontrib-openapi is updated to resolve this issue.
docutils<0.19
10 changes: 4 additions & 6 deletions requirements/edx/base.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,8 @@ djangorestframework-xml==2.0.0
# via edx-enterprise
docopt==0.6.2
# via -r requirements/edx/base.in
docutils==0.17.1
# via
# -c requirements/edx/../constraints.txt
# botocore
docutils==0.18.1
# via botocore
done-xblock==2.0.4
# via -r requirements/edx/base.in
drf-jwt==1.19.2
Expand Down Expand Up @@ -1011,7 +1009,7 @@ scipy==1.7.3
# openedx-calc
semantic-version==2.10.0
# via edx-drf-extensions
shapely==1.8.4
shapely==1.8.5
# via -r requirements/edx/base.in
simplejson==3.17.6
# via
Expand Down Expand Up @@ -1082,7 +1080,7 @@ sqlparse==0.4.3
# django
staff-graded-xblock==2.0.1
# via -r requirements/edx/base.in
stevedore==4.0.0
stevedore==4.0.1
# via
# -r requirements/edx/base.in
# -r requirements/edx/paver.txt
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/development.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ django-debug-toolbar # A set of panels that display debug inf
edx-sphinx-theme # Documentation theme
mypy # static type checking
pywatchman # More efficient checking for runserver reload trigger events
sphinxcontrib-openapi[markdown]==0.6.0 # OpenAPI (fka Swagger) spec renderer for Sphinx; pinned because 0.70 requires Python >=3.6
sphinxcontrib-openapi[markdown] # OpenAPI (fka Swagger) spec renderer for Sphinx
vulture # Detects possible dead/unused code, used in scripts/find-dead-code.sh
15 changes: 7 additions & 8 deletions requirements/edx/development.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,8 @@ djangorestframework-xml==2.0.0
# edx-enterprise
docopt==0.6.2
# via -r requirements/edx/testing.txt
docutils==0.17.1
docutils==0.18.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/testing.txt
# botocore
# m2r
Expand Down Expand Up @@ -701,7 +700,7 @@ execnet==1.9.0
# pytest-xdist
factory-boy==3.2.1
# via -r requirements/edx/testing.txt
faker==15.0.0
faker==15.1.0
# via
# -r requirements/edx/testing.txt
# factory-boy
Expand Down Expand Up @@ -1392,7 +1391,7 @@ semantic-version==2.10.0
# via
# -r requirements/edx/testing.txt
# edx-drf-extensions
shapely==1.8.4
shapely==1.8.5
# via -r requirements/edx/testing.txt
simplejson==3.17.6
# via
Expand Down Expand Up @@ -1475,11 +1474,11 @@ soupsieve==2.3.2.post1
# via
# -r requirements/edx/testing.txt
# beautifulsoup4
sphinx==5.0.2
sphinx==5.2.3
# via
# -c requirements/edx/../constraints.txt
# edx-sphinx-theme
# sphinxcontrib-httpdomain
# sphinxcontrib-openapi
sphinxcontrib-applehelp==1.0.2
# via sphinx
sphinxcontrib-devhelp==1.0.2
Expand All @@ -1490,7 +1489,7 @@ sphinxcontrib-httpdomain==1.8.0
# via sphinxcontrib-openapi
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-openapi[markdown]==0.6.0
sphinxcontrib-openapi[markdown]==0.7.0
# via -r requirements/edx/development.in
sphinxcontrib-qthelp==1.0.3
# via sphinx
Expand All @@ -1508,7 +1507,7 @@ starlette==0.20.4
# via
# -r requirements/edx/testing.txt
# fastapi
stevedore==4.0.0
stevedore==4.0.1
# via
# -r requirements/edx/testing.txt
# code-annotations
Expand Down
11 changes: 4 additions & 7 deletions requirements/edx/doc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ click==8.1.3
# code-annotations
code-annotations==1.3.0
# via -r requirements/edx/doc.in
docutils==0.17.1
# via
# -c requirements/edx/../constraints.txt
# sphinx
docutils==0.18.1
# via sphinx
edx-sphinx-theme==3.0.0
# via -r requirements/edx/doc.in
gitdb==4.0.9
Expand Down Expand Up @@ -66,9 +64,8 @@ smmap==5.0.0
# via gitdb
snowballstemmer==2.2.0
# via sphinx
sphinx==5.0.2
sphinx==5.2.3
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.in
# edx-sphinx-theme
sphinxcontrib-applehelp==1.0.2
Expand All @@ -83,7 +80,7 @@ sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
stevedore==4.0.0
stevedore==4.0.1
# via code-annotations
text-unidecode==1.3
# via python-slugify
Expand Down
2 changes: 1 addition & 1 deletion requirements/edx/paver.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ six==1.16.0
# libsass
# paver
# python-memcached
stevedore==4.0.0
stevedore==4.0.1
# via
# -r requirements/edx/paver.in
# edx-opaque-keys
Expand Down
9 changes: 4 additions & 5 deletions requirements/edx/testing.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,9 +494,8 @@ djangorestframework-xml==2.0.0
# edx-enterprise
docopt==0.6.2
# via -r requirements/edx/base.txt
docutils==0.17.1
docutils==0.18.1
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
# botocore
done-xblock==2.0.4
Expand Down Expand Up @@ -678,7 +677,7 @@ execnet==1.9.0
# via pytest-xdist
factory-boy==3.2.1
# via -r requirements/edx/testing.in
faker==15.0.0
faker==15.1.0
# via factory-boy
fastapi==0.85.0
# via pact-python
Expand Down Expand Up @@ -1319,7 +1318,7 @@ semantic-version==2.10.0
# via
# -r requirements/edx/base.txt
# edx-drf-extensions
shapely==1.8.4
shapely==1.8.5
# via -r requirements/edx/base.txt
simplejson==3.17.6
# via
Expand Down Expand Up @@ -1405,7 +1404,7 @@ staff-graded-xblock==2.0.1
# via -r requirements/edx/base.txt
starlette==0.20.4
# via fastapi
stevedore==4.0.0
stevedore==4.0.1
# via
# -r requirements/edx/base.txt
# code-annotations
Expand Down