Packaging Updates

thejcfactor · thejcfactor · commit 294ef5fb9c5e · 2025-08-01T13:06:01.000-06:00
Changes
=======
* Update pyproject.toml and setup.py to handle package_data
* Update MANIFEST.in to correctly handle package_data
* Add uv.lock file to git
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,7 +1,7 @@
 include *.txt LICENSE CONTRIBUTING.md pyproject.toml couchbase_analytics_version.py
 include couchbase-sdk-analytics-python-black-duck-manifest.yaml
-include couchbase_analytics/common/core/_nonprod_certificates/*.pem
-include couchbase_analytics/common/core/_capella_certificates/*.pem
+include couchbase_analytics/common/_core/nonprod_certificates/*.pem
+include couchbase_analytics/common/_core/capella_certificates/*.pem
 recursive-include couchbase_analytics *.py
 exclude couchbase_analytics/tests/*.py
 recursive-include acouchbase_analytics *.py
diff --git a/couchbase_analytics/_version.py b/couchbase_analytics/_version.py
@@ -1,5 +1,5 @@
 # This file automatically generated by
-#    /Users/jaredcasey/GIT/couchbase/clients/python/analytics-python-client/./couchbase_analytics_version.py
+#    /Users/jaredcasey/GIT/couchbase/clients/python/analytics-python-client/couchbase_analytics_version.py
 # at
-#    2025-07-09 14:23:23.011656
+#    2025-07-16 15:02:22.211821
 __version__ = '1.0.0.dev1'
diff --git a/couchbase_analytics/common/_core/capella_certificates/capella.pem b/couchbase_analytics/common/_core/capella_certificates/capella.pem
diff --git a/couchbase_analytics/common/_core/certificates.py b/couchbase_analytics/common/_core/certificates.py
@@ -44,7 +44,7 @@ def get_capella_certificates() -> List[str]:
         Returns:
             List[str]: List of Capella certificates.
         """
-        nonprod_cert_dir = Path(Path(__file__).resolve().parent, '_capella_certificates')
+        nonprod_cert_dir = Path(Path(__file__).resolve().parent, 'capella_certificates')
         nonprod_certs: List[str] = []
         for cert in nonprod_cert_dir.iterdir():
             if os.path.isdir(cert) or cert.suffix != '.pem':
@@ -64,7 +64,7 @@ def get_nonprod_certificates() -> List[str]:
         import warnings
 
         warnings.warn('Only use non-prod certificate in DEVELOPMENT environments.', ResourceWarning, stacklevel=2)
-        nonprod_cert_dir = Path(Path(__file__).resolve().parent, '_nonprod_certificates')
+        nonprod_cert_dir = Path(Path(__file__).resolve().parent, 'nonprod_certificates')
         nonprod_certs: List[str] = []
         for cert in nonprod_cert_dir.iterdir():
             if os.path.isdir(cert) or cert.suffix != '.pem':
diff --git a/couchbase_analytics/common/_core/nonprod_certificates/nonprod.pem b/couchbase_analytics/common/_core/nonprod_certificates/nonprod.pem
diff --git a/couchbase_analytics/protocol/connection.py b/couchbase_analytics/protocol/connection.py
@@ -20,7 +20,7 @@
 from typing import TYPE_CHECKING, Dict, List, Optional, Tuple, TypedDict, cast
 from urllib.parse import parse_qs, urlparse
 
-from couchbase_analytics.common._core._certificates import _Certificates
+from couchbase_analytics.common._core.certificates import _Certificates
 from couchbase_analytics.common._core.duration_str_utils import parse_duration_str
 from couchbase_analytics.common._core.utils import is_null_or_empty
 from couchbase_analytics.common.credential import Credential
diff --git a/pyproject.toml b/pyproject.toml
@@ -77,6 +77,21 @@ sphinx = [
     "sphinx-toolbox~=3.7",
 ]
 
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = [
+    "acouchbase_analytics",
+    "couchbase_analytics",
+    "acouchbase_analytics.*",
+    "couchbase_analytics.*",
+]
+exclude = [
+    "acouchbase_analytics.tests",
+    "couchbase_analytics.tests",
+]
+
 [tool.pytest.ini_options]
 minversion = "8.0"
 log_cli = true
diff --git a/setup.py b/setup.py
@@ -16,7 +16,7 @@
 import os
 import sys
 
-from setuptools import find_packages, setup
+from setuptools import setup
 
 sys.path.append('.')
 import couchbase_analytics_version  # nopep8 # isort:skip # noqa: E402
@@ -29,24 +29,11 @@
 PYCBAC_README = os.path.join(os.path.dirname(__file__), 'README.md')
 PYCBAC_VERSION = couchbase_analytics_version.get_version()
 
-
-package_data = {
-    'couchbase_analytics.common.core._nonprod_certificates': ['*.pem'],
-    'couchbase_analytics.common.core._capella_certificates': ['*.pem'],
-}
-
 print(f'Python Analytics SDK version: {PYCBAC_VERSION}')
 
 setup(
     name='couchbase-analytics',
     version=PYCBAC_VERSION,
-    python_requires='>=3.9',
-    install_requires=['httpx~=0.28.1', 'ijson~=3.3.0', 'typing-extensions~=4.11; python_version<"3.11"'],
-    packages=find_packages(
-        include=['acouchbase_analytics', 'couchbase_analytics', 'acouchbase_analytics.*', 'couchbase_analytics.*'],
-        exclude=['acouchbase_analytics.tests', 'couchbase_analytics.tests'],
-    ),
-    package_data=package_data,
     long_description=open(PYCBAC_README, 'r').read(),
     long_description_content_type='text/markdown',
 )
diff --git a/tests/environments/base_environment.py b/tests/environments/base_environment.py
@@ -306,7 +306,7 @@ def get_environment(
         cred = Credential.from_username_and_password(username, pw)
         sec_opts: Optional[SecurityOptions] = None
         if config.nonprod is True:
-            from couchbase_analytics.common._core._certificates import _Certificates
+            from couchbase_analytics.common._core.certificates import _Certificates
 
             sec_opts = SecurityOptions.trust_only_certificates(_Certificates.get_nonprod_certificates())
 
@@ -510,7 +510,7 @@ def get_environment(
         cred = Credential.from_username_and_password(username, pw)
         sec_opts: Optional[SecurityOptions] = None
         if config.nonprod is True:
-            from couchbase_analytics.common._core._certificates import _Certificates
+            from couchbase_analytics.common._core.certificates import _Certificates
 
             sec_opts = SecurityOptions.trust_only_certificates(_Certificates.get_nonprod_certificates())
 
diff --git a/uv.lock b/uv.lock
