Move to src style layout

Also use Hatch rather than setuptools.

This means that if the source distribution has a directory added to it
(as is needed for packaging for OS distributions) the package can still
be built.

pyproject.toml

@@ -1,9 +1,9 @@
 [build-system]
 requires = [
-    "setuptools >= 65",
-    "versioningit >= 2.1.0",
+    "hatchling",
+    "versioningit >= 3.1.0",
 ]
-build-backend = "setuptools.build_meta"
+build-backend = "hatchling.build"
 
 [project]
 name = "pg8000"
@@ -38,6 +38,9 @@ dynamic = ["version"]
 [project.urls]
 Homepage = "https://github.com/tlocke/pg8000"
 
+[tool.hatch.version]
+source = "versioningit"
+
 [tool.versioningit]
 
 [tool.versioningit.vcs]

test/dbapi/auth/test_scram-sha-256.py

@@ -3,13 +3,29 @@
 from pg8000.dbapi import DatabaseError, connect
 
 # This requires a line in pg_hba.conf that requires scram-sha-256 for the
-# database scram-sha-256
+# database pg8000_scram-sha-256
 
+DB = "pg8000_scram_sha_256"
 
-def test_scram_sha_256(db_kwargs):
-    db_kwargs["database"] = "pg8000_scram_sha_256"
 
-    # Should only raise an exception saying db doesn't exist
-    with pytest.raises(DatabaseError, match="3D000"):
-        with connect(**db_kwargs) as con:
-            con.close()
+@pytest.fixture
+def setup(con, cursor):
+    try:
+        cursor.execute(f"CREATE DATABASE {DB}")
+    except DatabaseError:
+        con.rollback()
+
+    con.autocommit = True
+    con.rollback()
+    cursor.execute("ALTER SYSTEM SET ssl = off")
+    cursor.execute("SELECT pg_reload_conf()")
+    yield
+    cursor.execute("ALTER SYSTEM SET ssl = on")
+    cursor.execute("SELECT pg_reload_conf()")
+
+
+def test_scram_sha_256(setup, db_kwargs):
+    db_kwargs["database"] = DB
+
+    with connect(**db_kwargs):
+        pass

test/dbapi/auth/test_scram-sha-256_ssl.py

@@ -1,22 +1,36 @@
-import ssl
-
+from ssl import CERT_NONE, create_default_context
 import pytest
 
 from pg8000.dbapi import DatabaseError, connect
 
 # This requires a line in pg_hba.conf that requires scram-sha-256 for the
-# database scram-sha-256
+# database pg8000_scram-sha-256
+
+DB = "pg8000_scram_sha_256"
+
+
+@pytest.fixture
+def setup(con, cursor):
+    try:
+        cursor.execute(f"CREATE DATABASE {DB}")
+    except DatabaseError:
+        con.rollback()
 
 
 def test_scram_sha_256(db_kwargs):
-    context = ssl.create_default_context()
-    context.check_hostname = False
-    context.verify_mode = ssl.CERT_NONE
+    db_kwargs["database"] = "pg8000_scram_sha_256"
+
+    con = connect(**db_kwargs)
+    con.close()
+
+
+def test_scram_sha_256_ssl_context(db_kwargs):
+    ssl_context = create_default_context()
+    ssl_context.check_hostname = False
+    ssl_context.verify_mode = CERT_NONE
 
-    db_kwargs["ssl_context"] = context
     db_kwargs["database"] = "pg8000_scram_sha_256"
+    db_kwargs["ssl_context"] = ssl_context
 
-    # Should only raise an exception saying db doesn't exist
-    with pytest.raises(DatabaseError, match="3D000"):
-        with connect(**db_kwargs) as con:
-            con.close()
+    con = connect(**db_kwargs)
+    con.close()

test/dbapi/test_connection.py

@@ -30,9 +30,12 @@ def test_Connection_plain_socket(db_kwargs):
     host = db_kwargs.get("host", "localhost")
     port = db_kwargs.get("port", 5432)
     with socket.create_connection((host, port)) as sock:
-        user = db_kwargs["user"]
-        password = db_kwargs["password"]
-        conn_params = {"sock": sock, "user": user, "password": password}
+        conn_params = {
+            "sock": sock,
+            "user": db_kwargs["user"],
+            "password": db_kwargs["password"],
+            "ssl_context": False,
+        }
 
         con = connect(**conn_params)
         cur = con.cursor()

test/legacy/test_connection.py

@@ -185,15 +185,24 @@ def test_application_name_bytearray(db_kwargs):
 
 
 # This requires a line in pg_hba.conf that requires scram-sha-256 for the
-# database scram-sha-256
+# database pg8000_scram_sha_256
 
+DB = "pg8000_scram_sha_256"
 
-def test_scram_sha_256(db_kwargs):
-    db_kwargs["database"] = "pg8000_scram_sha_256"
 
-    # Should only raise an exception saying db doesn't exist
-    with pytest.raises(ProgrammingError, match="3D000"):
-        connect(**db_kwargs)
+@pytest.fixture
+def setup(con, cursor):
+    try:
+        cursor.execute(f"CREATE DATABASE {DB}")
+    except DatabaseError:
+        con.rollback()
+
+
+def test_scram_sha_256(setup, db_kwargs):
+    db_kwargs["database"] = DB
+
+    con = connect(**db_kwargs)
+    con.close()
 
 
 @pytest.mark.parametrize(

test/native/auth/test_scram-sha-256.py

@@ -3,7 +3,7 @@
 from pg8000.native import Connection, DatabaseError, InterfaceError
 
 # This requires a line in pg_hba.conf that requires scram-sha-256 for the
-# database scram_sha_256
+# database pg8000_scram_sha_256
 
 DB = "pg8000_scram_sha_256"
 

test/native/test_connection.py

@@ -29,9 +29,12 @@ def test_Connection_plain_socket(db_kwargs):
     host = db_kwargs.get("host", "localhost")
     port = db_kwargs.get("port", 5432)
     with socket.create_connection((host, port)) as sock:
-        user = db_kwargs["user"]
-        password = db_kwargs["password"]
-        conn_params = {"sock": sock, "user": user, "password": password}
+        conn_params = {
+            "sock": sock,
+            "user": db_kwargs["user"],
+            "password": db_kwargs["password"],
+            "ssl_context": False,
+        }
 
         con = Connection(**conn_params)