Skip to content

Commit

Permalink
Merge pull request #2105 from openedx/feanil/make_upgrade
Browse files Browse the repository at this point in the history
chore: Run `make upgrade`
  • Loading branch information
feanil committed Feb 9, 2023
2 parents 52816ad + 09a9cb5 commit 885f2dd
Show file tree
Hide file tree
Showing 10 changed files with 135 additions and 103 deletions.
15 changes: 15 additions & 0 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# .readthedocs.yaml
# Read the Docs configuration file
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

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

python:
install:
- requirements: 'requirements/base.txt'
1 change: 0 additions & 1 deletion en_us/olx/source/front_matter/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ General Information
#############################

.. toctree::
:numbered:
:maxdepth: 2

read_me
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ Open Response Assessments
=========================

.. toctree::
:numbered:
:maxdepth: 2

OpenResponseAssessments
Expand Down
2 changes: 1 addition & 1 deletion en_us/shared/glossary/glossary.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ T
instance of Open edX with a campus or institutional authentication system,
see :ref:`installation:Enabling Third Party Authentication`.

.. _Transcript:
.. _Transcript Definition:

**transcript**

Expand Down
51 changes: 27 additions & 24 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,68 +1,71 @@
#
# 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
#
alabaster==0.7.12
alabaster==0.7.13
# via sphinx
babel==2.10.3
babel==2.11.0
# via
# sphinx
# sphinx-intl
certifi==2022.12.7
# via requests
charset-normalizer==2.0.12
charset-normalizer==3.0.1
# via requests
click==8.1.3
# via sphinx-intl
docutils==0.17.1
docutils==0.19
# via sphinx
edx-sphinx-theme==3.0.0
# via -r base.in
idna==3.3
edx-sphinx-theme==3.1.0
# via -r requirements/base.in
idna==3.4
# via requests
imagesize==1.3.0
imagesize==1.4.1
# via sphinx
importlib-metadata==6.0.0
# via sphinx
jinja2==3.1.2
# via sphinx
markupsafe==2.1.1
markupsafe==2.1.2
# via jinja2
packaging==21.3
packaging==23.0
# via sphinx
pygments==2.12.0
pygments==2.14.0
# via sphinx
pyparsing==3.0.9
# via packaging
pytz==2022.1
pytz==2022.7.1
# via babel
requests==2.28.0
requests==2.28.2
# via sphinx
six==1.16.0
# via edx-sphinx-theme
snowballstemmer==2.2.0
# via sphinx
sphinx==4.5.0
sphinx==5.3.0
# via
# -r base.in
# -c requirements/common_constraints.txt
# -r requirements/base.in
# edx-sphinx-theme
# sphinx-intl
sphinx-intl==2.0.1
# via -r base.in
sphinxcontrib-applehelp==1.0.2
sphinx-intl==2.1.0
# via -r requirements/base.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
sphinxcontrib-devhelp==1.0.2
# via sphinx
sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-htmlhelp==2.0.1
# via sphinx
sphinxcontrib-jsmath==1.0.1
# via sphinx
sphinxcontrib-qthelp==1.0.3
# via sphinx
sphinxcontrib-serializinghtml==1.1.5
# via sphinx
urllib3==1.26.9
urllib3==1.26.14
# via requests
zipp==3.12.1
# via importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# setuptools
11 changes: 9 additions & 2 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,14 @@ Django<4.0
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
elasticsearch<7.14.0

setuptools<60

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
django-simple-history==3.0.0

# tox>4.0.0 isn't yet compatible with many tox plugins, causing CI failures in almost all repos.
# Details can be found in this discussion: https://github.com/tox-dev/tox/discussions/1810
tox<4.0.0

# edx-sphinx-theme is not compatible with latest Sphinx==6.0.0 version
# Pinning Sphinx version unless the compatibility issue gets resolved
# For details, see issue https://github.com/openedx/edx-sphinx-theme/issues/197
sphinx<6.0.0
117 changes: 62 additions & 55 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,124 +1,131 @@
#
# 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
#
alabaster==0.7.12
alabaster==0.7.13
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
babel==2.10.3
babel==2.11.0
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
# sphinx-intl
build==0.10.0
# via pip-tools
certifi==2022.12.7
# via
# -r base.txt
# -r requirements/base.txt
# requests
charset-normalizer==2.0.12
charset-normalizer==3.0.1
# via
# -r base.txt
# -r requirements/base.txt
# requests
click==8.1.3
# via
# -r base.txt
# -r requirements/base.txt
# pip-tools
# sphinx-intl
docutils==0.17.1
docutils==0.19
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
edx-sphinx-theme==3.0.0
# via -r base.txt
idna==3.3
edx-sphinx-theme==3.1.0
# via -r requirements/base.txt
idna==3.4
# via
# -r base.txt
# -r requirements/base.txt
# requests
imagesize==1.3.0
imagesize==1.4.1
# via
# -r requirements/base.txt
# sphinx
importlib-metadata==6.0.0
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
jinja2==3.1.2
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
markupsafe==2.1.1
markupsafe==2.1.2
# via
# -r base.txt
# -r requirements/base.txt
# jinja2
packaging==21.3
packaging==23.0
# via
# -r base.txt
# -r requirements/base.txt
# build
# sphinx
pep517==0.12.0
# via pip-tools
pip-tools==6.6.2
# via -r dev.in
pygments==2.12.0
pip-tools==6.12.2
# via -r requirements/dev.in
pygments==2.14.0
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
pyparsing==3.0.9
# via
# -r base.txt
# packaging
pytz==2022.1
pyproject-hooks==1.0.0
# via build
pytz==2022.7.1
# via
# -r base.txt
# -r requirements/base.txt
# babel
requests==2.28.0
requests==2.28.2
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
six==1.16.0
# via
# -r base.txt
# -r requirements/base.txt
# edx-sphinx-theme
snowballstemmer==2.2.0
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinx==4.5.0
sphinx==5.3.0
# via
# -r base.txt
# -r requirements/base.txt
# edx-sphinx-theme
# sphinx-intl
sphinx-intl==2.0.1
# via -r base.txt
sphinxcontrib-applehelp==1.0.2
sphinx-intl==2.1.0
# via -r requirements/base.txt
sphinxcontrib-applehelp==1.0.4
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinxcontrib-devhelp==1.0.2
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinxcontrib-htmlhelp==2.0.0
sphinxcontrib-htmlhelp==2.0.1
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinxcontrib-jsmath==1.0.1
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinxcontrib-qthelp==1.0.3
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
sphinxcontrib-serializinghtml==1.1.5
# via
# -r base.txt
# -r requirements/base.txt
# sphinx
tomli==2.0.1
# via pep517
urllib3==1.26.9
# via build
urllib3==1.26.14
# via
# -r base.txt
# -r requirements/base.txt
# requests
wheel==0.38.1
wheel==0.38.4
# via pip-tools
zipp==3.12.1
# via
# -r requirements/base.txt
# importlib-metadata

# The following packages are considered to be unsafe in a requirements file:
# pip
Expand Down
20 changes: 12 additions & 8 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
#
# 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
#
click==8.1.3
build==0.10.0
# via pip-tools
pep517==0.12.0
click==8.1.3
# via pip-tools
pip-tools==6.6.2
# via -r pip-tools.in
packaging==23.0
# via build
pip-tools==6.12.2
# via -r requirements/pip-tools.in
pyproject-hooks==1.0.0
# via build
tomli==2.0.1
# via pep517
wheel==0.38.1
# via build
wheel==0.38.4
# via pip-tools

# The following packages are considered to be unsafe in a requirements file:
Expand Down
18 changes: 8 additions & 10 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -1,16 +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.38.1
# via -r pip.in
wheel==0.38.4
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==22.1.2
# via -r pip.in
setuptools==59.8.0
# via
# -c common_constraints.txt
# -r pip.in
pip==23.0
# via -r requirements/pip.in
setuptools==67.2.0
# via -r requirements/pip.in

0 comments on commit 885f2dd

Please sign in to comment.