Skip to content

Commit

Permalink
chore: rebuilding the requirements with new constraint (#150)
Browse files Browse the repository at this point in the history
* updating setup.py to understand constraints
*  logic from https://github.com/openedx/xblock-sdk/blob/master/setup.py
  • Loading branch information
deborahgu authored Jul 30, 2024
1 parent 01e9c87 commit 2649635
Show file tree
Hide file tree
Showing 11 changed files with 186 additions and 234 deletions.
18 changes: 6 additions & 12 deletions i18n/__init__.py
Original file line number Diff line number Diff line change
@@ -1,32 +1,26 @@
"""
Tool to be used by other IDAs for internationalization.
"""

import argparse
import sys

from . import config

__version__ = '1.6.1'
__version__ = "1.6.2"


class Runner:
"""
Runner class for internationalization.
"""

def __init__(self):
self.args = sys.argv[1:]
self.configuration = None
self.parser = argparse.ArgumentParser()
self.parser.add_argument(
'--config',
'-c',
help='configuration file'
)
self.parser.add_argument(
'-v', '--verbose',
action='count', default=0,
help="Turns on info-level logging."
)
self.parser.add_argument("--config", "-c", help="configuration file")
self.parser.add_argument("-v", "--verbose", action="count", default=0, help="Turns on info-level logging.")
self.add_args()

def add_args(self):
Expand All @@ -45,6 +39,6 @@ def __call__(self, **kwargs):
args = self.parser.parse_known_args(self.args)[0]
for key, val in kwargs.items():
setattr(args, key, val)
root_dir = kwargs.get('root_dir')
root_dir = kwargs.get("root_dir")
self.configuration = config.Configuration(filename=args.config, root_dir=root_dir)
return self.run(args)
22 changes: 9 additions & 13 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,32 +1,28 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
#
asgiref==3.8.1
# via django
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# django
django==4.2.11
django==4.2.14
# via
# -c requirements/common_constraints.txt
# -r requirements/base.in
lxml[html-clean,html_clean]==5.2.1
lxml[html-clean,html_clean]==5.2.2
# via
# -r requirements/base.in
# lxml-html-clean
lxml-html-clean==0.1.1
lxml-html-clean==0.2.0
# via lxml
path==16.14.0
# via -r requirements/base.in
path==16.16.0
# via
# -c requirements/constraints.txt
# -r requirements/base.in
polib==1.2.0
# via -r requirements/base.in
pyyaml==6.0.1
# via -r requirements/base.in
sqlparse==0.5.0
sqlparse==0.5.1
# via django
typing-extensions==4.11.0
# via asgiref
74 changes: 27 additions & 47 deletions requirements/ci.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# This file is autogenerated by pip-compile with Python 3.8
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# make upgrade
Expand All @@ -8,17 +8,12 @@ asgiref==3.8.1
# via
# -r requirements/test.txt
# django
astroid==3.1.0
astroid==3.2.4
# via
# -r requirements/test.txt
# pylint
# pylint-celery
backports-zoneinfo==0.2.1 ; python_version < "3.9"
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
# django
cachetools==5.3.3
cachetools==5.4.0
# via
# -r requirements/tox.txt
# tox
Expand All @@ -44,7 +39,7 @@ colorama==0.4.6
# via
# -r requirements/tox.txt
# tox
coverage[toml]==7.5.0
coverage[toml]==7.6.0
# via
# -r requirements/ci.in
# -r requirements/test.txt
Expand All @@ -59,17 +54,13 @@ distlib==0.3.8
# via
# -r requirements/tox.txt
# virtualenv
django==4.2.11
django==4.2.14
# via
# -c requirements/common_constraints.txt
# -r requirements/test.txt
edx-lint==5.3.6
edx-lint==5.3.7
# via -r requirements/test.txt
exceptiongroup==1.2.1
# via
# -r requirements/test.txt
# pytest
filelock==3.13.4
filelock==3.15.4
# via
# -r requirements/tox.txt
# tox
Expand All @@ -82,16 +73,18 @@ isort==5.13.2
# via
# -r requirements/test.txt
# pylint
jinja2==3.1.3
jinja2==3.1.4
# via
# -r requirements/test.txt
# code-annotations
lxml[html-clean]==5.2.1
lxml[html-clean]==5.2.2
# via
# -r requirements/test.txt
# lxml-html-clean
lxml-html-clean==0.1.1
# via -r requirements/test.txt
lxml-html-clean==0.2.0
# via
# -r requirements/test.txt
# lxml
markupsafe==2.1.5
# via
# -r requirements/test.txt
Expand All @@ -104,20 +97,22 @@ mock==3.0.5
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
packaging==24.0
packaging==24.1
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# pyproject-api
# pytest
# tox
path==16.14.0
# via -r requirements/test.txt
path==16.16.0
# via
# -c requirements/constraints.txt
# -r requirements/test.txt
pbr==6.0.0
# via
# -r requirements/test.txt
# stevedore
platformdirs==4.2.1
platformdirs==4.2.2
# via
# -r requirements/test.txt
# -r requirements/tox.txt
Expand All @@ -132,9 +127,9 @@ pluggy==1.5.0
# tox
polib==1.2.0
# via -r requirements/test.txt
pycodestyle==2.11.1
pycodestyle==2.12.0
# via -r requirements/test.txt
pylint==3.1.0
pylint==3.2.6
# via
# -r requirements/test.txt
# edx-lint
Expand All @@ -154,11 +149,11 @@ pylint-plugin-utils==0.8.2
# -r requirements/test.txt
# pylint-celery
# pylint-django
pyproject-api==1.6.1
pyproject-api==1.7.1
# via
# -r requirements/tox.txt
# tox
pytest==8.1.1
pytest==8.3.2
# via
# -r requirements/test.txt
# pytest-cov
Expand All @@ -179,7 +174,7 @@ six==1.16.0
# -r requirements/test.txt
# edx-lint
# mock
sqlparse==0.5.0
sqlparse==0.5.1
# via
# -r requirements/test.txt
# django
Expand All @@ -191,28 +186,13 @@ text-unidecode==1.3
# via
# -r requirements/test.txt
# python-slugify
tomli==2.0.1
# via
# -r requirements/test.txt
# -r requirements/tox.txt
# coverage
# pylint
# pyproject-api
# pytest
# tox
tomlkit==0.12.4
tomlkit==0.13.0
# via
# -r requirements/test.txt
# pylint
tox==4.14.2
tox==4.16.0
# via -r requirements/tox.txt
typing-extensions==4.11.0
# via
# -r requirements/test.txt
# asgiref
# astroid
# pylint
virtualenv==20.26.0
virtualenv==20.26.3
# via
# -r requirements/tox.txt
# tox
8 changes: 8 additions & 0 deletions requirements/common_constraints.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Django<5.0

# elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
# elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
# See https://github.com/openedx/edx-platform/issues/35126 for more info
elasticsearch<7.14.0

# django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
Expand All @@ -35,3 +36,10 @@ django-simple-history==3.0.0
# So we need to pin it globally, for now.
# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
importlib-metadata<7

# 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
Loading

0 comments on commit 2649635

Please sign in to comment.