Revert psycopg2 an optional dependency for functional tests based on Debian issue #1120888 (#1164)

Author: kalxas

requirements-dev.txt

@@ -1,7 +1,7 @@
 -r requirements.txt
 -r requirements-standalone.txt
+-r requirements-pg.txt
 
-apipkg==1.4
 pytest==6.2.4
 pytest-cov==2.12.0
 pytest-flake8==1.0.7

tests/functionaltests/conftest.py

@@ -35,20 +35,14 @@
 import os
 import re
 
-import apipkg
+import psycopg2
 import pytest
 
 from pycsw.core import admin
 from pycsw.core.config import StaticContext
 from pycsw.core.repository import Repository, setup
 from pycsw.ogc.api.util import yaml_load
 
-apipkg.initpkg("optionaldependencies", {
-    "psycopg2": "psycopg2",
-})
-
-from optionaldependencies import psycopg2  # NOQA: E402
-
 TESTS_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
 SuiteDirs = namedtuple("SuiteDirs", [