From 49f08f029b1a0497bc7958b5121e9ccb45849652 Mon Sep 17 00:00:00 2001 From: Omar Al-Ithawi Date: Sun, 20 Aug 2023 15:37:19 +0300 Subject: [PATCH] chore: rename transifex-resources.ini file and upgrade deps This is a noisy chore commit that is intended to prep for other Transifex workflows. --- Makefile | 4 +- requirements/pip.txt | 6 +- requirements/pip_tools.txt | 7 +- requirements/test.in | 2 +- requirements/test.txt | 65 +++++++++++++------ requirements/transifex-resources.txt | 36 ---------- .../{transifex-resources.in => transifex.in} | 2 + requirements/transifex.txt | 55 ++++++++++++++++ requirements/translations.txt | 2 +- 9 files changed, 113 insertions(+), 66 deletions(-) delete mode 100644 requirements/transifex-resources.txt rename requirements/{transifex-resources.in => transifex.in} (58%) create mode 100644 requirements/transifex.txt diff --git a/Makefile b/Makefile index 69e63906b05..a9990de4783 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,12 @@ upgrade: piptools ## update the requirements/*.txt files with the latest packag pip install -qr requirements/pip.txt pip install -qr requirements/pip_tools.txt pip-compile --rebuild --upgrade -o requirements/translations.txt requirements/translations.in - pip-compile --rebuild --upgrade -o requirements/transifex-resources.txt requirements/transifex-resources.in + pip-compile --rebuild --upgrade -o requirements/transifex.txt requirements/transifex.in pip-compile --rebuild --upgrade -o requirements/test.txt requirements/test.in transifex_resources_requirements: ## Installs the requirements file - pip install -q -r requirements/transifex-resources.txt + pip install -q -r requirements/transifex.txt fix_transifex_resource_names: ## Runs the script python scripts/fix_transifex_resource_names.py diff --git a/requirements/pip.txt b/requirements/pip.txt index bd9fb553181..f36085a07d6 100644 --- a/requirements/pip.txt +++ b/requirements/pip.txt @@ -4,11 +4,11 @@ # # make upgrade # -wheel==0.40.0 +wheel==0.41.1 # via -r requirements/pip.in # The following packages are considered to be unsafe in a requirements file: -pip==23.2 +pip==23.2.1 # via -r requirements/pip.in -setuptools==68.0.0 +setuptools==68.1.2 # via -r requirements/pip.in diff --git a/requirements/pip_tools.txt b/requirements/pip_tools.txt index 6d3e830858a..c38c47670b6 100644 --- a/requirements/pip_tools.txt +++ b/requirements/pip_tools.txt @@ -6,11 +6,11 @@ # build==0.10.0 # via pip-tools -click==8.1.6 +click==8.1.7 # via pip-tools packaging==23.1 # via build -pip-tools==7.1.0 +pip-tools==7.3.0 # via -r requirements/pip_tools.in pyproject-hooks==1.0.0 # via build @@ -18,7 +18,8 @@ tomli==2.0.1 # via # build # pip-tools -wheel==0.40.0 + # pyproject-hooks +wheel==0.41.1 # via pip-tools # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements/test.in b/requirements/test.in index e033644b88c..216f53e0079 100644 --- a/requirements/test.in +++ b/requirements/test.in @@ -1,5 +1,5 @@ -c constraints.txt --r transifex-resources.txt +-r transifex.txt pytest diff --git a/requirements/test.txt b/requirements/test.txt index 7d07fe15312..65bb8ad9d5a 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -6,29 +6,37 @@ # asttokens==2.2.1 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # transifex-python -certifi==2023.5.7 +certifi==2023.7.22 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # requests charset-normalizer==3.2.0 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # requests -click==8.1.6 +click==8.1.7 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # transifex-python -exceptiongroup==1.1.2 +exceptiongroup==1.1.3 # via pytest future==0.18.3 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # pyseeyou +gitdb==4.0.10 + # via + # -r requirements/transifex.txt + # gitpython +gitpython==3.1.32 + # via + # -r requirements/transifex.txt + # transifex-client idna==3.4 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # requests iniconfig==2.0.0 # via pytest @@ -36,41 +44,58 @@ packaging==23.1 # via pytest parsimonious==0.10.0 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # pyseeyou pluggy==1.2.0 # via pytest pyseeyou==1.0.2 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # transifex-python pytest==7.4.0 # via -r requirements/test.in +python-slugify==4.0.1 + # via + # -r requirements/transifex.txt + # transifex-client pytz==2023.3 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # transifex-python -regex==2023.6.3 +regex==2023.8.8 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # parsimonious requests==2.31.0 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt + # transifex-client # transifex-python six==1.16.0 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # asttokens + # transifex-client +smmap==5.0.0 + # via + # -r requirements/transifex.txt + # gitdb +text-unidecode==1.3 + # via + # -r requirements/transifex.txt + # python-slugify tomli==2.0.1 # via pytest toolz==0.12.0 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # pyseeyou +transifex-client==0.14.4 + # via -r requirements/transifex.txt transifex-python==3.4.0 - # via -r requirements/transifex-resources.txt -urllib3==2.0.4 + # via -r requirements/transifex.txt +urllib3==1.26.16 # via - # -r requirements/transifex-resources.txt + # -r requirements/transifex.txt # requests + # transifex-client diff --git a/requirements/transifex-resources.txt b/requirements/transifex-resources.txt deleted file mode 100644 index 83f78fdc15b..00000000000 --- a/requirements/transifex-resources.txt +++ /dev/null @@ -1,36 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# make upgrade -# -asttokens==2.2.1 - # via transifex-python -certifi==2023.5.7 - # via requests -charset-normalizer==3.2.0 - # via requests -click==8.1.6 - # via transifex-python -future==0.18.3 - # via pyseeyou -idna==3.4 - # via requests -parsimonious==0.10.0 - # via pyseeyou -pyseeyou==1.0.2 - # via transifex-python -pytz==2023.3 - # via transifex-python -regex==2023.6.3 - # via parsimonious -requests==2.31.0 - # via transifex-python -six==1.16.0 - # via asttokens -toolz==0.12.0 - # via pyseeyou -transifex-python==3.4.0 - # via -r requirements/transifex-resources.in -urllib3==2.0.4 - # via requests diff --git a/requirements/transifex-resources.in b/requirements/transifex.in similarity index 58% rename from requirements/transifex-resources.in rename to requirements/transifex.in index e1944f70359..52a663f5253 100644 --- a/requirements/transifex-resources.in +++ b/requirements/transifex.in @@ -1,3 +1,5 @@ -c constraints.txt +requests +transifex-client transifex-python diff --git a/requirements/transifex.txt b/requirements/transifex.txt new file mode 100644 index 00000000000..3be9a78f5ee --- /dev/null +++ b/requirements/transifex.txt @@ -0,0 +1,55 @@ +# +# This file is autogenerated by pip-compile with Python 3.8 +# by the following command: +# +# make upgrade +# +asttokens==2.2.1 + # via transifex-python +certifi==2023.7.22 + # via requests +charset-normalizer==3.2.0 + # via requests +click==8.1.7 + # via transifex-python +future==0.18.3 + # via pyseeyou +gitdb==4.0.10 + # via gitpython +gitpython==3.1.32 + # via transifex-client +idna==3.4 + # via requests +parsimonious==0.10.0 + # via pyseeyou +pyseeyou==1.0.2 + # via transifex-python +python-slugify==4.0.1 + # via transifex-client +pytz==2023.3 + # via transifex-python +regex==2023.8.8 + # via parsimonious +requests==2.31.0 + # via + # -r requirements/transifex.in + # transifex-client + # transifex-python +six==1.16.0 + # via + # asttokens + # transifex-client +smmap==5.0.0 + # via gitdb +text-unidecode==1.3 + # via python-slugify +toolz==0.12.0 + # via pyseeyou +transifex-client==0.14.4 + # via -r requirements/transifex.in +transifex-python==3.4.0 + # via -r requirements/transifex.in +urllib3==1.26.16 + # via + # requests + # transifex-client diff --git a/requirements/translations.txt b/requirements/translations.txt index a84d0538a59..a614d1c6dbd 100644 --- a/requirements/translations.txt +++ b/requirements/translations.txt @@ -10,7 +10,7 @@ django==3.2.20 # via # -c https://raw.githubusercontent.com/edx/edx-lint/master/edx_lint/files/common_constraints.txt # edx-i18n-tools -edx-i18n-tools==1.0.0 +edx-i18n-tools==1.1.0 # via -r requirements/translations.in path==16.7.1 # via edx-i18n-tools