Skip to content

Commit

Permalink
fix: unpin lxml constraint
Browse files Browse the repository at this point in the history
  • Loading branch information
@irtazaakram
irtazaakram committed Apr 24, 2024
1 parent 2ae3902 commit a9c33e6
Show file tree
Hide file tree
Showing 15 changed files with 63 additions and 60 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $(COMMON_CONSTRAINTS_TXT):

upgrade: export CUSTOM_COMPILE_COMMAND=make upgrade
upgrade: piptools $(COMMON_CONSTRAINTS_TXT)## update the requirements/*.txt files with the latest packages satisfying requirements/*.in
pip install -qr requirements/pip_tools.txt
pip install -qr requirements/pip_tools.txt
pip-compile --allow-unsafe --upgrade --rebuild -o requirements/pip.txt requirements/pip.in
pip-compile --upgrade -o requirements/pip_tools.txt requirements/pip_tools.in
pip install -qr requirements/pip.txt
Expand Down
2 changes: 1 addition & 1 deletion i18n/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

from . import config

__version__ = '1.5.0'
__version__ = '1.4.0'


class Runner:
Expand Down
2 changes: 1 addition & 1 deletion requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Django
polib
path
pyYaml
lxml
lxml[html_clean]
12 changes: 7 additions & 5 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,19 @@ django==4.2.11
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
lxml==4.9.3
lxml[html-clean,html_clean]==5.2.1
# via
# -c requirements/constraints.txt
# -r requirements/base.in
path==16.10.0
# lxml-html-clean
lxml-html-clean==0.1.1
# via lxml
path==16.14.0
# via -r requirements/base.in
polib==1.2.0
# via -r requirements/base.in
pyyaml==6.0.1
# via -r requirements/base.in
sqlparse==0.4.4
sqlparse==0.5.0
# via django
typing-extensions==4.10.0
typing-extensions==4.11.0
# via asgiref
26 changes: 14 additions & 12 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,15 @@ click-log==0.4.0
# via
# -r requirements/test.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/test.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
coverage[toml]==7.4.4
coverage[toml]==7.5.0
# via
# -r requirements/ci.in
# -r requirements/test.txt
Expand All @@ -65,11 +65,11 @@ django==4.2.11
# -r requirements/test.txt
edx-lint==5.3.6
# via -r requirements/test.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
filelock==3.13.3
filelock==3.13.4
# via
# -r requirements/tox.txt
# tox
Expand All @@ -86,10 +86,12 @@ jinja2==3.1.3
# via
# -r requirements/test.txt
# code-annotations
lxml==4.9.3
lxml[html-clean]==5.2.1
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# lxml-html-clean
lxml-html-clean==0.1.1
# via -r requirements/test.txt
markupsafe==2.1.5
# via
# -r requirements/test.txt
Expand All @@ -109,20 +111,20 @@ packaging==24.0
# pyproject-api
# pytest
# tox
path==16.10.0
path==16.14.0
# via -r requirements/test.txt
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==4.2.0
platformdirs==4.2.1
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/test.txt
# -r requirements/tox.txt
Expand Down Expand Up @@ -177,7 +179,7 @@ six==1.16.0
# -r requirements/test.txt
# edx-lint
# mock
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/test.txt
# django
Expand All @@ -204,13 +206,13 @@ tomlkit==0.12.4
# pylint
tox==4.14.2
# via -r requirements/tox.txt
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/test.txt
# asgiref
# astroid
# pylint
virtualenv==20.25.1
virtualenv==20.26.0
# via
# -r requirements/tox.txt
# tox
6 changes: 1 addition & 5 deletions requirements/common_constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# This is a temporary solution to override the real common_constraints.txt
# In edx-lint, until the pyjwt constraint in edx-lint has been removed.
# See BOM-2721 for more details.
# Below is the copied and edited version of common_constraints

# A central location for most common version constraints
# (across edx repos) for pip-installation.
#
Expand All @@ -30,6 +25,7 @@ Django<5.0
elasticsearch<7.14.0

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

# opentelemetry requires version 6.x at the moment:
# https://github.com/open-telemetry/opentelemetry-python/issues/3570
Expand Down
3 changes: 0 additions & 3 deletions requirements/constraints.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ mock<4.0.0

# temporary constraint
backports.zoneinfo;python_version<"3.9"

# greater version has issues.
lxml==4.9.3
26 changes: 14 additions & 12 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ click-log==0.4.0
# via
# -r requirements/ci.txt
# edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via
# -r requirements/ci.txt
# edx-lint
colorama==0.4.6
# via
# -r requirements/ci.txt
# tox
coverage[toml]==7.4.4
coverage[toml]==7.5.0
# via
# -r requirements/ci.txt
# pytest-cov
Expand All @@ -70,11 +70,11 @@ django==4.2.11
# -r requirements/ci.txt
edx-lint==5.3.6
# via -r requirements/ci.txt
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via
# -r requirements/ci.txt
# pytest
filelock==3.13.3
filelock==3.13.4
# via
# -r requirements/ci.txt
# tox
Expand All @@ -96,10 +96,12 @@ jinja2==3.1.3
# via
# -r requirements/ci.txt
# code-annotations
lxml==4.9.3
lxml[html-clean]==5.2.1
# via
# -c requirements/constraints.txt
# -r requirements/ci.txt
# lxml-html-clean
lxml-html-clean==0.1.1
# via -r requirements/ci.txt
markupsafe==2.1.5
# via
# -r requirements/ci.txt
Expand All @@ -120,21 +122,21 @@ packaging==24.0
# pyproject-api
# pytest
# tox
path==16.10.0
path==16.14.0
# via -r requirements/ci.txt
pbr==6.0.0
# via
# -r requirements/ci.txt
# stevedore
pip-tools==7.4.1
# via -r requirements/pip_tools.txt
platformdirs==4.2.0
platformdirs==4.2.1
# via
# -r requirements/ci.txt
# pylint
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via
# -r requirements/ci.txt
# pytest
Expand Down Expand Up @@ -193,7 +195,7 @@ six==1.16.0
# -r requirements/ci.txt
# edx-lint
# mock
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/ci.txt
# django
Expand Down Expand Up @@ -223,13 +225,13 @@ tomlkit==0.12.4
# pylint
tox==4.14.2
# via -r requirements/ci.txt
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/ci.txt
# asgiref
# astroid
# pylint
virtualenv==20.25.1
virtualenv==20.26.0
# via
# -r requirements/ci.txt
# tox
Expand Down
2 changes: 1 addition & 1 deletion requirements/pip.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ wheel==0.43.0
# The following packages are considered to be unsafe in a requirements file:
pip==24.0
# via -r requirements/pip.in
setuptools==69.2.0
setuptools==69.5.1
# via -r requirements/pip.in
24 changes: 14 additions & 10 deletions requirements/test.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ click==8.1.7
# edx-lint
click-log==0.4.0
# via edx-lint
code-annotations==1.7.0
code-annotations==1.8.0
# via edx-lint
coverage[toml]==7.4.4
coverage[toml]==7.5.0
# via
# -r requirements/test.in
# pytest-cov
Expand All @@ -39,18 +39,22 @@ dill==0.3.8
# -r requirements/base.txt
edx-lint==5.3.6
# via -r requirements/test.in
exceptiongroup==1.2.0
exceptiongroup==1.2.1
# via pytest
iniconfig==2.0.0
# via pytest
isort==5.13.2
# via pylint
jinja2==3.1.3
# via code-annotations
lxml==4.9.3
lxml[html-clean]==5.2.1
# via
# -r requirements/base.txt
# lxml-html-clean
lxml-html-clean==0.1.1
# via
# -c requirements/constraints.txt
# -r requirements/base.txt
# lxml
markupsafe==2.1.5
# via jinja2
mccabe==0.7.0
Expand All @@ -61,13 +65,13 @@ mock==3.0.5
# -r requirements/test.in
packaging==24.0
# via pytest
path==16.10.0
path==16.14.0
# via -r requirements/base.txt
pbr==6.0.0
# via stevedore
platformdirs==4.2.0
platformdirs==4.2.1
# via pylint
pluggy==1.4.0
pluggy==1.5.0
# via pytest
polib==1.2.0
# via -r requirements/base.txt
Expand Down Expand Up @@ -103,7 +107,7 @@ six==1.16.0
# via
# edx-lint
# mock
sqlparse==0.4.4
sqlparse==0.5.0
# via
# -r requirements/base.txt
# django
Expand All @@ -118,7 +122,7 @@ tomli==2.0.1
# pytest
tomlkit==0.12.4
# via pylint
typing-extensions==4.10.0
typing-extensions==4.11.0
# via
# -r requirements/base.txt
# asgiref
Expand Down
8 changes: 4 additions & 4 deletions requirements/tox.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,19 @@ colorama==0.4.6
# via tox
distlib==0.3.8
# via virtualenv
filelock==3.13.3
filelock==3.13.4
# via
# tox
# virtualenv
packaging==24.0
# via
# pyproject-api
# tox
platformdirs==4.2.0
platformdirs==4.2.1
# via
# tox
# virtualenv
pluggy==1.4.0
pluggy==1.5.0
# via tox
pyproject-api==1.6.1
# via tox
Expand All @@ -34,5 +34,5 @@ tomli==2.0.1
# tox
tox==4.14.2
# via -r requirements/tox.in
virtualenv==20.25.1
virtualenv==20.26.0
# via tox
2 changes: 1 addition & 1 deletion tests/test_converter.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ def test_converter(self, data):
"""
source, expected = data
result = UpcaseConverter().convert(source)
self.assertEquals(result, expected)
self.assertEqual(result, expected)
Loading

0 comments on commit a9c33e6

Please sign in to comment.