Skip pg stuff on osx.

Author: ionelmc

.github/workflows/github-actions.yml

@@ -29,7 +29,7 @@ jobs:
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'arm64'
-            tox_env: 'py38-pg2'
+            tox_env: 'py38'
             os: 'macos-latest'
           - name: 'py38-pg3 (ubuntu)'
             python: '3.8'
@@ -41,7 +41,7 @@ jobs:
             python: '3.8'
             toxpython: 'python3.8'
             python_arch: 'arm64'
-            tox_env: 'py38-pg3'
+            tox_env: 'py38'
             os: 'macos-latest'
           - name: 'py39-pg2 (ubuntu)'
             python: '3.9'
@@ -53,7 +53,7 @@ jobs:
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'arm64'
-            tox_env: 'py39-pg2'
+            tox_env: 'py39'
             os: 'macos-latest'
           - name: 'py39-pg3 (ubuntu)'
             python: '3.9'
@@ -65,7 +65,7 @@ jobs:
             python: '3.9'
             toxpython: 'python3.9'
             python_arch: 'arm64'
-            tox_env: 'py39-pg3'
+            tox_env: 'py39'
             os: 'macos-latest'
           - name: 'py310-pg2 (ubuntu)'
             python: '3.10'
@@ -77,7 +77,7 @@ jobs:
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'arm64'
-            tox_env: 'py310-pg2'
+            tox_env: 'py310'
             os: 'macos-latest'
           - name: 'py310-pg3 (ubuntu)'
             python: '3.10'
@@ -89,7 +89,7 @@ jobs:
             python: '3.10'
             toxpython: 'python3.10'
             python_arch: 'arm64'
-            tox_env: 'py310-pg3'
+            tox_env: 'py310'
             os: 'macos-latest'
           - name: 'py311-pg2 (ubuntu)'
             python: '3.11'
@@ -101,7 +101,7 @@ jobs:
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'arm64'
-            tox_env: 'py311-pg2'
+            tox_env: 'py311'
             os: 'macos-latest'
           - name: 'py311-pg3 (ubuntu)'
             python: '3.11'
@@ -113,7 +113,7 @@ jobs:
             python: '3.11'
             toxpython: 'python3.11'
             python_arch: 'arm64'
-            tox_env: 'py311-pg3'
+            tox_env: 'py311'
             os: 'macos-latest'
           - name: 'py312-pg2 (ubuntu)'
             python: '3.12'
@@ -125,7 +125,7 @@ jobs:
             python: '3.12'
             toxpython: 'python3.12'
             python_arch: 'arm64'
-            tox_env: 'py312-pg2'
+            tox_env: 'py312'
             os: 'macos-latest'
           - name: 'py312-pg3 (ubuntu)'
             python: '3.12'
@@ -137,7 +137,7 @@ jobs:
             python: '3.12'
             toxpython: 'python3.12'
             python_arch: 'arm64'
-            tox_env: 'py312-pg3'
+            tox_env: 'py312'
             os: 'macos-latest'
           - name: 'pypy38-pg2 (ubuntu)'
             python: 'pypy-3.8'
@@ -149,7 +149,7 @@ jobs:
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'arm64'
-            tox_env: 'pypy38-pg2'
+            tox_env: 'pypy38'
             os: 'macos-latest'
           - name: 'pypy38-pg3 (ubuntu)'
             python: 'pypy-3.8'
@@ -161,7 +161,7 @@ jobs:
             python: 'pypy-3.8'
             toxpython: 'pypy3.8'
             python_arch: 'arm64'
-            tox_env: 'pypy38-pg3'
+            tox_env: 'pypy38'
             os: 'macos-latest'
           - name: 'pypy39-pg2 (ubuntu)'
             python: 'pypy-3.9'
@@ -173,7 +173,7 @@ jobs:
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'arm64'
-            tox_env: 'pypy39-pg2'
+            tox_env: 'pypy39'
             os: 'macos-latest'
           - name: 'pypy39-pg3 (ubuntu)'
             python: 'pypy-3.9'
@@ -185,7 +185,7 @@ jobs:
             python: 'pypy-3.9'
             toxpython: 'pypy3.9'
             python_arch: 'arm64'
-            tox_env: 'pypy39-pg3'
+            tox_env: 'pypy39'
             os: 'macos-latest'
           - name: 'pypy310-pg2 (ubuntu)'
             python: 'pypy-3.10'
@@ -197,7 +197,7 @@ jobs:
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
             python_arch: 'arm64'
-            tox_env: 'pypy310-pg2'
+            tox_env: 'pypy310'
             os: 'macos-latest'
           - name: 'pypy310-pg3 (ubuntu)'
             python: 'pypy-3.10'
@@ -209,7 +209,7 @@ jobs:
             python: 'pypy-3.10'
             toxpython: 'pypy3.10'
             python_arch: 'arm64'
-            tox_env: 'pypy310-pg3'
+            tox_env: 'pypy310'
             os: 'macos-latest'
     steps:
     - uses: actions/checkout@v4

ci/templates/.github/workflows/github-actions.yml

@@ -38,7 +38,7 @@ jobs:
             python: '{{ python }}'
             toxpython: '{{ toxpython }}'
             python_arch: '{{ python_arch }}'
-            tox_env: '{{ env }}'
+            tox_env: '{{ env if os == 'ubuntu' else prefix }}'
             os: '{{ os }}-latest'
 {% endfor %}
 {% endfor %}

tests/test_holdup.py

@@ -1,5 +1,6 @@
 # ruff: noqa: PTH110, PTH120, PTH123
 import os
+import platform
 import shutil
 import socket
 import threading
@@ -273,6 +274,7 @@ def test_eval_comma_anycheck(testdir, extra):
     assert result.ret == 0
 
 
+@pytest.mark.skipif(platform.system() != "Linux", reason="too complicated to install psycopg on non-linux")
 @pytest.mark.parametrize("proto", ["postgresql", "postgres", "pg"])
 def test_pg_timeout(testdir, proto):
     result = testdir.run("holdup", "-t", "0.1", proto + "://0.0.0.0/foo")