switch to using psycopg rather than psycopg2

for support for numpy v2.0

README.md

@@ -51,7 +51,7 @@ The required dependencies are:
 - astropy >= 5.0.4
 - cartopy >=0.20
 - numpy >= 1.19
-- psycopg2 >= 2.9
+- psycopg>=3.2.2
 - pyuvdata >= 2.2.9
 - pyyaml >= 5.1
 - redis-py >= 4.3.4 (Note that this is called "redis" on pypi and "redis-py" on conda)

ci/min_deps.yaml

@@ -7,7 +7,7 @@ dependencies:
   - cartopy>=0.20.0
   - coverage
   - numpy>=1.19.*
-  - psycopg2>=2.9
+  - psycopg>=3.2.2
   - pytest>=6.2.0
   - pytest-cov
   - pyuvdata>=2.2.9

ci/min_versions.yaml

@@ -12,7 +12,7 @@ dependencies:
   - pandas==1.4.0
   - pip
   - psutil==5.9.0
-  - psycopg2==2.9
+  - psycopg==3.2.2
   - pytest==6.2.0
   - pytest-cov
   - python-dateutil==2.8.2

ci/publish.yml

@@ -6,7 +6,7 @@ dependencies:
   - astropy>=5.0.4
   - cartopy>=0.20.0
   - numpy>=1.19.*
-  - psycopg2>=2.9
+  - psycopg>=3.2.2
   - pyuvdata>=2.2.9
   - pyyaml>=5.1
   - redis-py>=4.3.4

ci/tests.yaml

@@ -12,7 +12,7 @@ dependencies:
   - pandas>=1.4.0
   - pip
   - psutil>=5.9.0
-  - psycopg2>=2.9
+  - psycopg>=3.2.2
   - pytest>=6.2.0
   - pytest-cov
   - python-dateutil>=2.8.2

environment.yaml

@@ -12,7 +12,7 @@ dependencies:
   - pandas>=1.4.0
   - pip
   - psutil>=5.9.0
-  - psycopg2>=2.9
+  - psycopg>=3.2.2
   - pytest>=6.2.0
   - pytest-cov
   - python-dateutil>=2.8.2

hera_mc/mc.py

@@ -40,6 +40,8 @@ class DB(object, metaclass=ABCMeta):
     sqlalchemy_base = None
 
     def __init__(self, sqlalchemy_base, db_url):  # noqa
+        if "postgresql" in db_url and "postgresql+psycopg" not in db_url:
+            db_url = db_url.replace("postgresql", "postgresql+psycopg")
         self.sqlalchemy_base = MCDeclarativeBase
         self.engine = create_engine(db_url)
         self.sessionmaker.configure(bind=self.engine)

setup.py

@@ -36,7 +36,7 @@
         "astropy>=5.0.4",
         "cartopy>=0.20",
         "numpy>=1.19",
-        "psycopg2>=2.9",
+        "psycopg>=3.2.2",
         "pyuvdata>=2.2.9",
         "pyyaml>=5.1",
         "redis>=4.3.4",  # Note that this gets redis-py, which is named "redis" on pypi