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.

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

chore: resolve docutils version conflicts #241

Merged
merged 2 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ upgrade: $(COMMON_CONSTRAINTS_TXT)
sed 's/django-simple-history==3.0.0//g' requirements/common_constraints.txt > requirements/common_constraints.tmp
mv requirements/common_constraints.tmp requirements/common_constraints.txt
pip install -qr requirements/pip-tools.txt
pip-compile --rebuild --upgrade --allow-unsafe -o requirements/pip.txt requirements/pip.in
pip-compile --rebuild --upgrade -o requirements/pip-tools.txt requirements/pip-tools.in
pip install -qr requirements/pip.txt
pip install -qr requirements/pip-tools.txt
# Make sure to compile files after any other files they include!
# need to do this to remove django-simple-history from common constraint.
$(PIP_COMPILE) -o requirements/pip-tools.txt requirements/pip-tools.in
Expand Down
4 changes: 2 additions & 2 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ click-repl==0.3.0
# via celery
code-annotations==1.8.0
# via edx-toggles
cryptography==43.0.1
cryptography==44.0.0
# via pyjwt
django==4.2.16
# via
Expand Down Expand Up @@ -133,7 +133,7 @@ newrelic==9.13.0
# via edx-django-utils
openedx-events==9.14.1
# via -r requirements/base.in
packaging==24.1
packaging==24.2
# via drf-yasg
pbr==6.1.0
# via stevedore
Expand Down
2 changes: 1 addition & 1 deletion requirements/ci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ filelock==3.15.4
# via
# tox
# virtualenv
packaging==24.1
packaging==24.2
# via
# pyproject-api
# tox
Expand Down
10 changes: 3 additions & 7 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
# Note: Changes to this file will automatically be used by other repos, referencing
# this file from Github directly. It does not require packaging in edx-lint.


# using LTS django version
Django<5.0

Expand All @@ -24,9 +23,6 @@ elasticsearch<7.14.0
# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected


# Cause: https://github.com/openedx/event-tracking/pull/290
# event-tracking 2.4.1 upgrades to pymongo 4.4.0 which is not supported on edx-platform.
# We will pin event-tracking to do not break existing installations
# This can be unpinned once https://github.com/openedx/edx-platform/issues/34586
# has been resolved and edx-platform is running with pymongo>=4.4.0
event-tracking<2.4.1
# Cause: https://github.com/openedx/edx-lint/issues/458
# This can be unpinned once https://github.com/openedx/edx-lint/issues/459 has been resolved.
pip<24.3
9 changes: 9 additions & 0 deletions requirements/constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,14 @@ celery>=5.2.2,<6.0.0

django-simple-history==3.4.0

# docutils has conflicting version for the dependencies. Reference issue: https://github.com/edx/edx-name-affirmation/issues/231
# issue to unpin
# Date: 09-12-2024

sphinx==8.1.3
sphinx-book-theme==1.1.3
docutils==0.21.2
sphinxcontrib-applehelp==2.0.0

# Temporary to Support the python 3.11 Upgrade
backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
30 changes: 5 additions & 25 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ backports-tarfile==1.2.0
# via
# -r requirements/quality.txt
# jaraco-context
build==1.2.1
build==1.2.2.post1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand All @@ -33,10 +33,6 @@ certifi==2024.8.30
# via
# -r requirements/quality.txt
# requests
cffi==1.17.1
# via
# -r requirements/quality.txt
# cryptography
chardet==5.2.0
# via
# -r requirements/ci.txt
Expand Down Expand Up @@ -69,10 +65,6 @@ colorama==0.4.6
# tox
coverage==7.6.1
# via -r requirements/ci.txt
cryptography==43.0.1
# via
# -r requirements/quality.txt
# secretstorage
diff-cover==9.1.1
# via -r requirements/dev.in
dill==0.3.8
Expand All @@ -90,6 +82,7 @@ django==4.2.16
# edx-i18n-tools
docutils==0.21.2
# via
# -c requirements/constraints.txt
# -r requirements/quality.txt
# readme-renderer
# rstcheck-core
Expand Down Expand Up @@ -127,11 +120,6 @@ jaraco-functools==4.0.2
# via
# -r requirements/quality.txt
# keyring
jeepney==0.8.0
# via
# -r requirements/quality.txt
# keyring
# secretstorage
jinja2==3.1.4
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -172,7 +160,7 @@ nh3==0.2.18
# via
# -r requirements/quality.txt
# readme-renderer
packaging==24.1
packaging==24.2
# via
# -r requirements/ci.txt
# -r requirements/pip-tools.txt
Expand Down Expand Up @@ -207,10 +195,6 @@ polib==1.2.0
# via edx-i18n-tools
pycodestyle==2.12.1
# via -r requirements/quality.txt
pycparser==2.22
# via
# -r requirements/quality.txt
# cffi
pydantic==2.9.0
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -251,7 +235,7 @@ pyproject-api==1.7.1
# via
# -r requirements/ci.txt
# tox
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
# via
# -r requirements/pip-tools.txt
# build
Expand Down Expand Up @@ -293,10 +277,6 @@ rstcheck-core==1.2.1
# via
# -r requirements/quality.txt
# rstcheck
secretstorage==3.3.3
# via
# -r requirements/quality.txt
# keyring
shellingham==1.5.4
# via
# -r requirements/quality.txt
Expand Down Expand Up @@ -352,7 +332,7 @@ virtualenv==20.26.3
# via
# -r requirements/ci.txt
# tox
wheel==0.44.0
wheel==0.45.1
# via
# -r requirements/pip-tools.txt
# pip-tools
Expand Down
43 changes: 25 additions & 18 deletions requirements/doc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,11 @@ asgiref==3.8.1
attrs==24.2.0
# via openedx-events
babel==2.16.0
# via sphinx
# via
# pydata-sphinx-theme
# sphinx
beautifulsoup4==4.12.3
# via pydata-sphinx-theme
billiard==4.2.0
# via celery
celery==5.4.0
Expand Down Expand Up @@ -46,7 +50,7 @@ click-repl==0.3.0
# via celery
code-annotations==1.8.0
# via edx-toggles
cryptography==43.0.1
cryptography==44.0.0
# via pyjwt
django==4.2.16
# via
Expand Down Expand Up @@ -99,6 +103,7 @@ doc8==1.1.2
# via -r requirements/doc.in
docutils==0.21.2
# via
# -c requirements/constraints.txt
# doc8
# pydata-sphinx-theme
# readme-renderer
Expand All @@ -123,8 +128,11 @@ edx-django-utils==5.15.0
# openedx-events
edx-drf-extensions==10.4.0
# via -r requirements/base.in
edx-opaque-keys==2.11.0
# via edx-drf-extensions
edx-opaque-keys[django]==2.11.0
# via
# edx-ccx-keys
# edx-drf-extensions
# openedx-events
edx-toggles==5.2.0
# via -r requirements/base.in
fastavro==1.9.7
Expand All @@ -151,10 +159,9 @@ nh3==0.2.18
# via readme-renderer
openedx-events==9.14.1
# via -r requirements/base.in
packaging==24.1
packaging==24.2
# via
# drf-yasg
# pydata-sphinx-theme
# sphinx
pbr==6.1.0
# via stevedore
Expand All @@ -166,7 +173,7 @@ psutil==6.0.0
# via edx-django-utils
pycparser==2.22
# via cffi
pydata-sphinx-theme==0.14.4
pydata-sphinx-theme==0.16.0
# via sphinx-book-theme
pygments==2.18.0
# via
Expand Down Expand Up @@ -205,22 +212,28 @@ semantic-version==2.10.0
# via edx-drf-extensions
six==1.16.0
# via
# edx-ccx-keys
# pockets
# python-dateutil
# sphinxcontrib-napoleon
snowballstemmer==2.2.0
# via sphinx
soupsieve==2.5
# via beautifulsoup4
sphinx==5.3.0
sphinx==8.1.3
# via
# -c requirements/constraints.txt
# -r requirements/doc.in
# pydata-sphinx-theme
# sphinx-book-theme
sphinx-book-theme==1.0.1
# via -r requirements/doc.in
sphinxcontrib-applehelp==1.0.4
# via sphinx
sphinx-book-theme==1.1.3
# via
# -c requirements/constraints.txt
# -r requirements/doc.in
sphinxcontrib-applehelp==2.0.0
# via
# -c requirements/constraints.txt
# sphinx
sphinxcontrib-devhelp==2.0.0
# via sphinx
sphinxcontrib-htmlhelp==2.1.0
Expand All @@ -245,11 +258,8 @@ text-unidecode==1.3
# via python-slugify
typing-extensions==4.12.2
# via
# asgiref
# edx-opaque-keys
# kombu
# pydata-sphinx-theme
# via edx-opaque-keys
tzdata==2024.1
# via celery
uritemplate==4.1.1
Expand All @@ -263,6 +273,3 @@ vine==5.1.0
# kombu
wcwidth==0.2.13
# via prompt-toolkit

# The following packages are considered to be unsafe in a requirements file:
# setuptools
8 changes: 4 additions & 4 deletions requirements/pip-tools.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
#
# make upgrade
#
build==1.2.1
build==1.2.2.post1
# via pip-tools
click==8.1.7
# via pip-tools
packaging==24.1
packaging==24.2
# via build
pip-tools==7.4.1
# via -r requirements/pip-tools.in
pyproject-hooks==1.1.0
pyproject-hooks==1.2.0
# via
# build
# pip-tools
wheel==0.44.0
wheel==0.45.1
# via
# -r requirements/pip-tools.in
# pip-tools
Expand Down
6 changes: 6 additions & 0 deletions requirements/pip.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Core dependencies for installing other packages
-c constraints.txt

pip
setuptools
wheel
16 changes: 16 additions & 0 deletions requirements/pip.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
wheel==0.45.1
# via -r requirements/pip.in

# The following packages are considered to be unsafe in a requirements file:
pip==24.2
# via
# -c requirements/common_constraints.txt
# -r requirements/pip.in
setuptools==75.6.0
# via -r requirements/pip.in
13 changes: 1 addition & 12 deletions requirements/quality.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ backports-tarfile==1.2.0
# via jaraco-context
certifi==2024.8.30
# via requests
cffi==1.17.1
# via cryptography
charset-normalizer==3.3.2
# via requests
click==8.1.7
Expand All @@ -30,8 +28,6 @@ click-log==0.4.0
# via edx-lint
code-annotations==1.8.0
# via edx-lint
cryptography==43.0.1
# via secretstorage
dill==0.3.8
# via pylint
django==4.2.16
Expand All @@ -40,6 +36,7 @@ django==4.2.16
# -r requirements/quality.in
docutils==0.21.2
# via
# -c requirements/constraints.txt
# readme-renderer
# rstcheck-core
edx-lint==5.4.0
Expand All @@ -60,10 +57,6 @@ jaraco-context==6.0.1
# via keyring
jaraco-functools==4.0.2
# via keyring
jeepney==0.8.0
# via
# keyring
# secretstorage
jinja2==3.1.4
# via code-annotations
keyring==25.3.0
Expand All @@ -90,8 +83,6 @@ platformdirs==4.2.2
# via pylint
pycodestyle==2.12.1
# via -r requirements/quality.in
pycparser==2.22
# via cffi
pydantic==2.9.0
# via rstcheck-core
pydantic-core==2.23.2
Expand Down Expand Up @@ -138,8 +129,6 @@ rstcheck==6.2.4
# via -r requirements/quality.in
rstcheck-core==1.2.1
# via rstcheck
secretstorage==3.3.3
# via keyring
shellingham==1.5.4
# via typer
six==1.16.0
Expand Down
Loading
Loading