From c1f8888c7dfe1ec96ee0de1161e8ba2e29b3bbbb Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Tue, 12 Mar 2024 15:32:33 +0300 Subject: [PATCH] fix: fixup previous commit --- requirements/ci.txt | 12 +++++------ requirements/constraints.txt | 2 -- requirements/dev.txt | 41 ++++++++++++++++++++++++++---------- requirements/pip-tools.txt | 6 +++++- requirements/pip.txt | 4 ++-- requirements/quality.txt | 41 ++++++++++++++++++++++++++---------- requirements/test.txt | 40 +++++++++++++++++++++++++---------- 7 files changed, 101 insertions(+), 45 deletions(-) diff --git a/requirements/ci.txt b/requirements/ci.txt index e8ca687..f4eb155 100644 --- a/requirements/ci.txt +++ b/requirements/ci.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -68,11 +68,9 @@ tomli==2.0.1 # tox tox==4.13.0 # via -r requirements/ci.in -typing-extensions==4.9.0 +typing-extensions==4.10.0 # via asgiref -urllib3==1.26.18 - # via - # -c requirements/constraints.txt - # requests -virtualenv==20.25.0 +urllib3==2.2.1 + # via requests +virtualenv==20.25.1 # via tox diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 95b93ad..528e12d 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -12,5 +12,3 @@ # TODO: Many pinned dependencies should be unpinned and/or moved to this constraints file. pylint==2.12.2 - -urllib3<2.0.0 # avoid dependencies conflicts between botocore and requests diff --git a/requirements/dev.txt b/requirements/dev.txt index 6f98437..e5ed58b 100644 --- a/requirements/dev.txt +++ b/requirements/dev.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -18,9 +18,9 @@ backports-functools-lru-cache==2.0.0 # via caniusepython3 binaryornot==0.4.4 # via cookiecutter -boto3==1.34.44 +boto3==1.34.49 # via fs-s3fs -botocore==1.34.44 +botocore==1.34.49 # via # boto3 # s3transfer @@ -47,9 +47,9 @@ click-log==0.4.0 # via edx-lint code-annotations==1.6.0 # via edx-lint -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via pytest-cov ddt==1.7.1 # via -r requirements/test.in @@ -79,8 +79,14 @@ fs-s3fs==1.1.1 # via # openedx-django-pyfs # xblock-sdk +gitdb==4.0.11 + # via gitpython +gitpython==3.1.42 + # via transifex-client idna==3.6 # via requests +importlib-metadata==7.0.1 + # via build iniconfig==2.0.0 # via pytest isort==5.13.2 @@ -174,7 +180,7 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.in # pytest-cov @@ -188,10 +194,11 @@ python-dateutil==2.8.2 # arrow # botocore # xblock -python-slugify==8.0.4 +python-slugify==4.0.1 # via # code-annotations # cookiecutter + # transifex-client pytz==2024.1 # via # django @@ -207,6 +214,7 @@ requests==2.31.0 # -r requirements/base.in # caniusepython3 # cookiecutter + # transifex-client # xblock-sdk rich==13.7.0 # via cookiecutter @@ -222,11 +230,14 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil + # transifex-client +smmap==5.0.1 + # via gitdb snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via code-annotations text-unidecode==1.3 # via python-slugify @@ -239,15 +250,21 @@ tomli==2.0.1 # pip-tools # pyproject-hooks # pytest +transifex-client==0.14.4 + # via -r requirements/dev.in types-python-dateutil==2.8.19.20240106 # via arrow -typing-extensions==4.9.0 - # via asgiref +typing-extensions==4.10.0 + # via + # asgiref + # astroid + # pylint + # rich urllib3==1.26.18 # via - # -c requirements/constraints.txt # botocore # requests + # transifex-client web-fragments==2.1.0 # via # xblock @@ -268,6 +285,8 @@ xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt index 7cb86cc..44c48d9 100644 --- a/requirements/pip-tools.txt +++ b/requirements/pip-tools.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -8,6 +8,8 @@ build==1.0.3 # via pip-tools click==8.1.7 # via pip-tools +importlib-metadata==7.0.1 + # via build packaging==23.2 # via build pip-tools==7.4.0 @@ -23,6 +25,8 @@ tomli==2.0.1 # pyproject-hooks wheel==0.42.0 # via pip-tools +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/pip.txt b/requirements/pip.txt index 47e4e32..6665603 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -10,5 +10,5 @@ wheel==0.42.0 # The following packages are considered to be unsafe in a requirements file: pip==24.0 # via -r requirements/pip.in -setuptools==69.1.0 +setuptools==69.1.1 # via -r requirements/pip.in diff --git a/requirements/quality.txt b/requirements/quality.txt index 6f98437..e5ed58b 100644 --- a/requirements/quality.txt +++ b/requirements/quality.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -18,9 +18,9 @@ backports-functools-lru-cache==2.0.0 # via caniusepython3 binaryornot==0.4.4 # via cookiecutter -boto3==1.34.44 +boto3==1.34.49 # via fs-s3fs -botocore==1.34.44 +botocore==1.34.49 # via # boto3 # s3transfer @@ -47,9 +47,9 @@ click-log==0.4.0 # via edx-lint code-annotations==1.6.0 # via edx-lint -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via pytest-cov ddt==1.7.1 # via -r requirements/test.in @@ -79,8 +79,14 @@ fs-s3fs==1.1.1 # via # openedx-django-pyfs # xblock-sdk +gitdb==4.0.11 + # via gitpython +gitpython==3.1.42 + # via transifex-client idna==3.6 # via requests +importlib-metadata==7.0.1 + # via build iniconfig==2.0.0 # via pytest isort==5.13.2 @@ -174,7 +180,7 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.in # pytest-cov @@ -188,10 +194,11 @@ python-dateutil==2.8.2 # arrow # botocore # xblock -python-slugify==8.0.4 +python-slugify==4.0.1 # via # code-annotations # cookiecutter + # transifex-client pytz==2024.1 # via # django @@ -207,6 +214,7 @@ requests==2.31.0 # -r requirements/base.in # caniusepython3 # cookiecutter + # transifex-client # xblock-sdk rich==13.7.0 # via cookiecutter @@ -222,11 +230,14 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil + # transifex-client +smmap==5.0.1 + # via gitdb snowballstemmer==2.2.0 # via pydocstyle sqlparse==0.4.4 # via django -stevedore==5.1.0 +stevedore==5.2.0 # via code-annotations text-unidecode==1.3 # via python-slugify @@ -239,15 +250,21 @@ tomli==2.0.1 # pip-tools # pyproject-hooks # pytest +transifex-client==0.14.4 + # via -r requirements/dev.in types-python-dateutil==2.8.19.20240106 # via arrow -typing-extensions==4.9.0 - # via asgiref +typing-extensions==4.10.0 + # via + # asgiref + # astroid + # pylint + # rich urllib3==1.26.18 # via - # -c requirements/constraints.txt # botocore # requests + # transifex-client web-fragments==2.1.0 # via # xblock @@ -268,6 +285,8 @@ xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip diff --git a/requirements/test.txt b/requirements/test.txt index 1d04a94..0201330 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # # make upgrade @@ -12,9 +12,9 @@ asgiref==3.7.2 # via django binaryornot==0.4.4 # via cookiecutter -boto3==1.34.44 +boto3==1.34.49 # via fs-s3fs -botocore==1.34.44 +botocore==1.34.49 # via # boto3 # s3transfer @@ -32,9 +32,9 @@ click==8.1.7 # via # cookiecutter # pip-tools -cookiecutter==2.5.0 +cookiecutter==2.6.0 # via xblock-sdk -coverage[toml]==7.4.1 +coverage[toml]==7.4.3 # via pytest-cov ddt==1.7.1 # via -r requirements/test.in @@ -59,8 +59,14 @@ fs-s3fs==1.1.1 # via # openedx-django-pyfs # xblock-sdk +gitdb==4.0.11 + # via gitpython +gitpython==3.1.42 + # via transifex-client idna==3.6 # via requests +importlib-metadata==7.0.1 + # via build iniconfig==2.0.0 # via pytest jinja2==3.1.3 @@ -121,7 +127,7 @@ pyproject-hooks==1.0.0 # via # build # pip-tools -pytest==8.0.1 +pytest==8.0.2 # via # -r requirements/test.in # pytest-cov @@ -135,8 +141,10 @@ python-dateutil==2.8.2 # arrow # botocore # xblock -python-slugify==8.0.4 - # via cookiecutter +python-slugify==4.0.1 + # via + # cookiecutter + # transifex-client pytz==2024.1 # via # django @@ -150,6 +158,7 @@ requests==2.31.0 # via # -r requirements/base.in # cookiecutter + # transifex-client # xblock-sdk rich==13.7.0 # via cookiecutter @@ -164,6 +173,9 @@ six==1.16.0 # fs # fs-s3fs # python-dateutil + # transifex-client +smmap==5.0.1 + # via gitdb sqlparse==0.4.4 # via django text-unidecode==1.3 @@ -175,15 +187,19 @@ tomli==2.0.1 # pip-tools # pyproject-hooks # pytest +transifex-client==0.14.4 + # via -r requirements/dev.in types-python-dateutil==2.8.19.20240106 # via arrow -typing-extensions==4.9.0 - # via asgiref +typing-extensions==4.10.0 + # via + # asgiref + # rich urllib3==1.26.18 # via - # -c requirements/constraints.txt # botocore # requests + # transifex-client web-fragments==2.1.0 # via # xblock @@ -202,6 +218,8 @@ xblock-sdk==0.7.0 # via # -r requirements/dev.in # -r requirements/test.in +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip