Use --universal flag with uv pip compile (#3032)

* Use `--universal` flag with uv pip compile

* Upgrade to uv `0.2.26`, fixed astral-sh/uv#4885

* Update uv and remove `--no-strip-markers`
Apparently `--universal` implies `--no-strip-markers`

Author: CoolCat467

.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 --python-version=3.8 --upgrade test-requirements.in -o test-requirements.txt
+          uv pip compile --universal --python-version=3.8 --upgrade docs-requirements.in -o docs-requirements.txt
           pre-commit autoupdate --jobs 0
       - name: Black
         run: |

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 --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 --python-version=3.8 docs-requirements.in -o docs-requirements.txt
 echo "::endgroup::"
 
 if git status --porcelain | grep -q "requirements.txt"; then

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

test-requirements.in

@@ -15,7 +15,7 @@ mypy; implementation_name == "cpython"
 types-pyOpenSSL; implementation_name == "cpython" # and annotations
 ruff >= 0.4.3
 astor          # code generation
-uv >= 0.2.22
+uv >= 0.2.24
 codespell
 
 # https://github.com/python-trio/trio/pull/654#issuecomment-420518745

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 --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
@@ -127,7 +135,7 @@ sphinxcontrib-qthelp==1.0.3
     # via sphinx
 sphinxcontrib-serializinghtml==1.1.5
     # via sphinx
-tomli==2.0.1 ; python_version < '3.11' or (python_version < '3.11' and implementation_name == 'cpython')
+tomli==2.0.1 ; python_version < '3.11'
     # via
     #   black
     #   mypy
@@ -156,7 +164,7 @@ typing-extensions==4.12.2
     #   pylint
 urllib3==2.2.2
     # via requests
-uv==0.2.22
+uv==0.2.26
     # via -r test-requirements.in
 zipp==3.19.2 ; python_version < '3.10'
     # via importlib-metadata