From eaecdf0cef47c94ba5fc2dd36db41859ef7e6677 Mon Sep 17 00:00:00 2001 From: CoolCat467 <52022020+CoolCat467@users.noreply.github.com> Date: Sun, 7 Jul 2024 20:01:05 -0500 Subject: [PATCH] Use `--universal` flag with uv pip compile --- .github/workflows/autodeps.yml | 4 ++-- check.sh | 4 ++-- docs-requirements.txt | 14 ++++++++++---- test-requirements.txt | 18 +++++++++++++----- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.github/workflows/autodeps.yml b/.github/workflows/autodeps.yml index 2466c89fdd..eaeb50cced 100644 --- a/.github/workflows/autodeps.yml +++ b/.github/workflows/autodeps.yml @@ -28,8 +28,8 @@ jobs: run: | python -m pip install -U pip pre-commit python -m pip install -r test-requirements.txt - uv pip compile --no-strip-markers --python-version=3.8 --upgrade test-requirements.in -o test-requirements.txt - uv pip compile --no-strip-markers --python-version=3.8 --upgrade docs-requirements.in -o docs-requirements.txt + uv pip compile --universal --no-strip-markers --python-version=3.8 --upgrade test-requirements.in -o test-requirements.txt + uv pip compile --universal --no-strip-markers --python-version=3.8 --upgrade docs-requirements.in -o docs-requirements.txt pre-commit autoupdate --jobs 0 - name: Black run: | diff --git a/check.sh b/check.sh index 044a02962a..1e5b760b04 100755 --- a/check.sh +++ b/check.sh @@ -78,10 +78,10 @@ fi # Check pip compile is consistent echo "::group::Pip Compile - Tests" -uv pip compile --no-strip-markers --python-version=3.8 test-requirements.in -o test-requirements.txt +uv pip compile --universal --no-strip-markers --python-version=3.8 test-requirements.in -o test-requirements.txt echo "::endgroup::" echo "::group::Pip Compile - Docs" -uv pip compile --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt +uv pip compile --universal --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt echo "::endgroup::" if git status --porcelain | grep -q "requirements.txt"; then diff --git a/docs-requirements.txt b/docs-requirements.txt index b9def33ac2..2098586053 100644 --- a/docs-requirements.txt +++ b/docs-requirements.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt +# uv pip compile --universal --no-strip-markers --python-version=3.8 docs-requirements.in -o docs-requirements.txt alabaster==0.7.13 # via sphinx attrs==23.2.0 @@ -12,12 +12,18 @@ beautifulsoup4==4.12.3 # via sphinx-codeautolink certifi==2024.7.4 # via requests -cffi==1.16.0 ; platform_python_implementation != 'PyPy' - # via cryptography +cffi==1.16.0 ; os_name == 'nt' or platform_python_implementation != 'PyPy' + # via + # -r docs-requirements.in + # cryptography charset-normalizer==3.3.2 # via requests click==8.1.7 # via towncrier +colorama==0.4.6 ; platform_system == 'Windows' or sys_platform == 'win32' + # via + # click + # sphinx cryptography==42.0.8 # via pyopenssl docutils==0.20.1 @@ -51,7 +57,7 @@ outcome==1.3.0.post0 # via -r docs-requirements.in packaging==24.1 # via sphinx -pycparser==2.22 ; platform_python_implementation != 'PyPy' +pycparser==2.22 ; os_name == 'nt' or platform_python_implementation != 'PyPy' # via cffi pygments==2.18.0 # via sphinx diff --git a/test-requirements.txt b/test-requirements.txt index 9474325a54..bbe6421a65 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,5 +1,5 @@ # This file was autogenerated by uv via the following command: -# uv pip compile --no-strip-markers --python-version=3.8 test-requirements.in -o test-requirements.txt +# uv pip compile --universal --no-strip-markers --python-version=3.8 test-requirements.in -o test-requirements.txt alabaster==0.7.13 # via sphinx astor==0.8.1 @@ -18,14 +18,22 @@ black==24.4.2 ; implementation_name == 'cpython' # via -r test-requirements.in certifi==2024.7.4 # via requests -cffi==1.17.0rc1 ; platform_python_implementation != 'PyPy' - # via cryptography +cffi==1.17.0rc1 ; os_name == 'nt' or platform_python_implementation != 'PyPy' + # via + # -r test-requirements.in + # cryptography charset-normalizer==3.3.2 # via requests click==8.1.7 ; implementation_name == 'cpython' # via black codespell==2.3.0 # via -r test-requirements.in +colorama==0.4.6 ; sys_platform == 'win32' or (implementation_name == 'cpython' and platform_system == 'Windows') + # via + # click + # pylint + # pytest + # sphinx coverage==7.5.4 # via -r test-requirements.in cryptography==42.0.8 @@ -34,7 +42,7 @@ cryptography==42.0.8 # pyopenssl # trustme # types-pyopenssl -dill==0.3.8 ; python_version < '3.11' +dill==0.3.8 # via pylint docutils==0.20.1 # via sphinx @@ -89,7 +97,7 @@ platformdirs==4.2.2 # pylint pluggy==1.5.0 # via pytest -pycparser==2.22 ; platform_python_implementation != 'PyPy' +pycparser==2.22 ; os_name == 'nt' or platform_python_implementation != 'PyPy' # via cffi pygments==2.18.0 # via sphinx