fixing merge conflicts; updating to any_psycopg_compatibility

diff --cc doc/build/dialects/postgresql.rst
Simple merge

diff --cc lib/sqlalchemy/dialects/postgresql/__init__.py
index 9132675eeeab1b960a3d72f68f57c7b37ae0a381,62195f59e6b7d432fdcaefca74746f6f48cf9e40..baafdb1811f2665110eec915017df76455016b67
--- 1/lib/sqlalchemy/dialects/postgresql/__init__.py
--- 2/lib/sqlalchemy/dialects/postgresql/__init__.py
+++ b/lib/sqlalchemy/dialects/postgresql/__init__.py
@@@ -53,19 -41,30 +41,36 @@@ from .hstore import HSTOR
  from .hstore import hstore
  from .json import JSON
  from .json import JSONB
+ from .named_types import CreateDomainType
+ from .named_types import CreateEnumType
+ from .named_types import DropDomainType
+ from .named_types import DropEnumType
+ from .named_types import ENUM
+ from .named_types import NamedType
 +from .ranges import DATEMULTIRANGE
  from .ranges import DATERANGE
 +from .ranges import INT4MULTIRANGE
  from .ranges import INT4RANGE
 +from .ranges import INT8MULTIRANGE
  from .ranges import INT8RANGE
 +from .ranges import NUMMULTIRANGE
  from .ranges import NUMRANGE
 +from .ranges import TSMULTIRANGE
  from .ranges import TSRANGE
 +from .ranges import TSTZMULTIRANGE
  from .ranges import TSTZRANGE
- from ...util import compat
+ from .types import BIT
+ from .types import BYTEA
+ from .types import CIDR
+ from .types import INET
+ from .types import INTERVAL
+ from .types import MACADDR
+ from .types import MONEY
+ from .types import OID
+ from .types import REGCLASS
+ from .types import TIME
+ from .types import TIMESTAMP
+ from .types import TSVECTOR
  
  # Alias psycopg also as psycopg_async
  psycopg_async = type(

diff --cc lib/sqlalchemy/dialects/postgresql/base.py
Simple merge

diff --cc lib/sqlalchemy/dialects/postgresql/ranges.py
Simple merge

diff --cc test/dialect/postgresql/test_dialect.py
index 613fc80a5a08126f749f3c308909889ed38d1893,d55aa82039d32934721cc3f531ce69ca9a6eae88..e99014ab574b3b0f3b162dc0a1ad64864ec39fee
--- 1/test/dialect/postgresql/test_dialect.py
--- 2/test/dialect/postgresql/test_dialect.py
+++ b/test/dialect/postgresql/test_dialect.py
@@@ -1082,7 -1105,7 +1105,7 @@@ class MiscBackendTest
                  dbapi_conn.rollback()
              eq_(val, "off")
  
--    @testing.requires.psycopg_compatibility
++    @testing.requires.any_psycopg_compatibility
      def test_psycopg_non_standard_err(self):
          # note that psycopg2 is sometimes called psycopg2cffi
          # depending on platform
@@@ -1105,7 -1128,7 +1128,7 @@@
          assert isinstance(exception, exc.OperationalError)
  
      @testing.requires.no_coverage
--    @testing.requires.psycopg_compatibility
++    @testing.requires.any_psycopg_compatibility
      def test_notice_logging(self):
          log = logging.getLogger("sqlalchemy.dialects.postgresql")
          buf = logging.handlers.BufferingHandler(100)

diff --cc test/dialect/postgresql/test_types.py
index 4c7ca61dc1ad201c1941f3ecdc7f9846f5e36666,41bd1f5e7b5e4ffbb9ffc0bc3b0452161039c349..f774300e68e5bf85911701bcb050a2fa77ccad63
--- 1/test/dialect/postgresql/test_types.py
--- 2/test/dialect/postgresql/test_types.py
+++ b/test/dialect/postgresql/test_types.py
@@@ -37,21 -37,18 +38,24 @@@ from sqlalchemy import Unicod
  from sqlalchemy import util
  from sqlalchemy.dialects import postgresql
  from sqlalchemy.dialects.postgresql import array
 +from sqlalchemy.dialects.postgresql import DATEMULTIRANGE
  from sqlalchemy.dialects.postgresql import DATERANGE
+ from sqlalchemy.dialects.postgresql import DOMAIN
+ from sqlalchemy.dialects.postgresql import ENUM
  from sqlalchemy.dialects.postgresql import HSTORE
  from sqlalchemy.dialects.postgresql import hstore
 +from sqlalchemy.dialects.postgresql import INT4MULTIRANGE
  from sqlalchemy.dialects.postgresql import INT4RANGE
 +from sqlalchemy.dialects.postgresql import INT8MULTIRANGE
  from sqlalchemy.dialects.postgresql import INT8RANGE
  from sqlalchemy.dialects.postgresql import JSON
  from sqlalchemy.dialects.postgresql import JSONB
+ from sqlalchemy.dialects.postgresql import NamedType
 +from sqlalchemy.dialects.postgresql import NUMMULTIRANGE
  from sqlalchemy.dialects.postgresql import NUMRANGE
 +from sqlalchemy.dialects.postgresql import TSMULTIRANGE
  from sqlalchemy.dialects.postgresql import TSRANGE
 +from sqlalchemy.dialects.postgresql import TSTZMULTIRANGE
  from sqlalchemy.dialects.postgresql import TSTZRANGE
  from sqlalchemy.exc import CompileError
  from sqlalchemy.orm import declarative_base
@@@ -2424,7 -2650,7 +2657,7 @@@ class ArrayEnum(fixtures.TestBase)
              testing.combinations(
                  sqltypes.ARRAY,
                  postgresql.ARRAY,
--                (_ArrayOfEnum, testing.requires.psycopg_compatibility),
++                (_ArrayOfEnum, testing.requires.any_psycopg_compatibility),
                  argnames="array_cls",
              )(fn)
          )
@@@ -3447,7 -3701,7 +3708,7 @@@ class _RangeTypeCompilation(AssertsComp
  
  
  class _RangeTypeRoundTrip(fixtures.TablesTest):
--    __requires__ = "range_types", "psycopg_compatibility"
++    __requires__ = "range_types", "any_psycopg_compatibility"
      __backend__ = True
  
      def extras(self):

diff --cc test/requirements.py
index 7b89a8fe5da3f5e06ed429cb515446f4808e629b,db12990a37ea48323b082fbe9aa07ad211862a49..f351fb4cf364234acfc04bf43c5bf6e33b7f3c14
--- 1/test/requirements.py
--- 2/test/requirements.py
+++ b/test/requirements.py
@@@ -1279,7 -1334,7 +1334,7 @@@ class DefaultRequirements(SuiteRequirem
      @property
      def range_types(self):
          def check_range_types(config):
--            if not self.psycopg_compatibility.enabled:
++            if not self.any_psycopg_compatibility.enabled:
                  return False
              try:
                  with config.db.connect() as conn:
@@@ -1328,14 -1394,14 +1394,14 @@@
  
      @property
      def native_hstore(self):
--        return self.psycopg_compatibility
++        return self.any_psycopg_compatibility
  
      @property
      def psycopg2_compatibility(self):
          return only_on(["postgresql+psycopg2", "postgresql+psycopg2cffi"])
  
      @property
--    def psycopg_compatibility(self):
++    def any_psycopg_compatibility(self):
          return only_on(
              [
                  "postgresql+psycopg2",
@@@ -1344,13 -1410,9 +1410,13 @@@
              ]
          )
  
 +    @property
 +    def psycopg_only_compatibility(self):
 +        return only_on(["postgresql+psycopg"])
 +
      @property
      def psycopg_or_pg8000_compatibility(self):
--        return only_on([self.psycopg_compatibility, "postgresql+pg8000"])
++        return only_on([self.any_psycopg_compatibility, "postgresql+pg8000"])
  
      @property
      def percent_schema_names(self):