Reorganize project; modify tests for SQLA 1.4 (#141)

Reorganize project structure to conform with SQLALchemy's
explicit dialect/driver architecture. Adjust tests to pass
under SQLA 1.4, including when v2.0 deprecation warnings
are enabled (SQLALCHEMY_WARN_20=1).

Author: gordthompson

.gitignore

@@ -16,3 +16,6 @@ build/
 env/
 cockroach-data/
 cockroach.pid
+
+# local test configuration
+test.cfg

cockroachdb/sqlalchemy/__init__.py

@@ -4,40 +4,45 @@
 # generated dev-requirements.txt), run make update-requirements,
 # then re-run bootstrap.sh.
 
-flake8==3.9.1
-tox==3.23.0
+flake8==3.9.2
+tox==3.23.1
 # Twine is used in the release process to upload the package.
 twine==3.4.1
 ## The following requirements were added by pip freeze:
 appdirs==1.4.4
 bleach==3.3.0
-certifi==2020.12.5
+certifi==2021.5.30
+cffi==1.14.5
 chardet==4.0.0
 colorama==0.4.4
-distlib==0.3.1
+cryptography==3.4.7
+distlib==0.3.2
 docutils==0.17.1
 filelock==3.0.12
 idna==2.10
-importlib-metadata==4.0.1
+importlib-metadata==4.4.0
+jeepney==0.6.0
 keyring==23.0.1
 mccabe==0.6.1
 packaging==20.9
 pkginfo==1.7.0
 pluggy==0.13.1
 py==1.10.0
 pycodestyle==2.7.0
+pycparser==2.20
 pyflakes==2.3.1
-Pygments==2.8.1
+Pygments==2.9.0
 pyparsing==2.4.7
 readme-renderer==29.0
 requests==2.25.1
 requests-toolbelt==0.9.1
-rfc3986==1.4.0
-six==1.15.0
+rfc3986==1.5.0
+SecretStorage==3.3.1
+six==1.16.0
 toml==0.10.2
-tqdm==4.60.0
-typing-extensions==3.7.4.3
+tqdm==4.61.0
+typing-extensions==3.10.0.0
 urllib3==1.26.5
-virtualenv==20.4.4
+virtualenv==20.4.7
 webencodings==0.5.1
 zipp==3.4.1

cockroachdb/sqlalchemy/test_requirements.py

@@ -1,6 +1,10 @@
+[tool:pytest]
+addopts= --tb native -v -r fxX --maxfail=25 -p no:warnings
+python_files=test/*test_*.py
+
 [sqla_testing]
-requirement_cls = cockroachdb.sqlalchemy.test_requirements:Requirements
-profile_file=.profiles.txt
+requirement_cls = sqlalchemy_cockroachdb.requirements:Requirements
+profile_file=test/profiles.txt
 
 [db]
 default=cockroachdb://root@localhost:26257/defaultdb?disable_cockroachdb_telemetry=True

dev-requirements.txt

@@ -1,28 +1,42 @@
-from setuptools import setup
+import os
+import re
 
-with open("README.md", "r") as fh:
-    long_description = fh.read()
+from setuptools import setup, find_packages
+
+with open(os.path.join(os.path.dirname(__file__), "sqlalchemy_cockroachdb", "__init__.py")) as v:
+    VERSION = re.compile(r'.*__version__ = "(.*?)"', re.S).match(v.read()).group(1)
+
+readme = os.path.join(os.path.dirname(__file__), "README.md")
 
 setup(
-    name='sqlalchemy-cockroachdb',
-    version='1.3.3',
-    author='Cockroach Labs',
-    author_email='cockroach-db@googlegroups.com',
-    url='https://github.com/cockroachdb/sqlalchemy-cockroachdb',
-    description='CockroachDB adapter for SQLAlchemy',
-    long_description=long_description,
+    name="sqlalchemy-cockroachdb",
+    version=VERSION,
+    author="Cockroach Labs",
+    author_email="cockroach-db@googlegroups.com",
+    url="https://github.com/cockroachdb/sqlalchemy-cockroachdb",
+    description="CockroachDB dialect for SQLAlchemy",
+    long_description=open(readme).read(),
     long_description_content_type="text/markdown",
     license="http://www.apache.org/licenses/LICENSE-2.0",
     classifiers=[
-        'License :: OSI Approved :: Apache Software License',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 3',
-        ],
-
-    packages=['cockroachdb', 'cockroachdb.sqlalchemy'],
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 3",
+    ],
+    keywords="SQLAlchemy CockroachDB",
+    project_urls={
+        "Documentation": "https://github.com/cockroachdb/sqlalchemy-cockroachdb/wiki",
+        "Source": "https://github.com/cockroachdb/sqlalchemy-cockroachdb",
+        "Tracker": "https://github.com/cockroachdb/sqlalchemy-cockroachdb/issues",
+    },
+    packages=find_packages(include=["sqlalchemy_cockroachdb"]),
+    include_package_data=True,
+    install_requires=["SQLAlchemy"],
+    zip_safe=False,
     entry_points={
-        'sqlalchemy.dialects': [
-            'cockroachdb = cockroachdb.sqlalchemy.dialect:CockroachDBDialect',
+        "sqlalchemy.dialects": [
+            "cockroachdb.psycopg2 = sqlalchemy_cockroachdb.psycopg2:CockroachDBDialect_psycopg2",
+            "cockroachdb = sqlalchemy_cockroachdb.psycopg2:CockroachDBDialect_psycopg2",
         ],
     },
 )

setup.cfg

@@ -0,0 +1,9 @@
+from sqlalchemy.dialects import registry as _registry
+
+__version__ = "1.3.4.dev0"
+
+_registry.register(
+    "cockroachdb.psycopg2",
+    "sqlalchemy_cockroachdb.psycopg2",
+    "CockroachDBDialect_psycopg2",
+)