Skip to content

Commit 8c023a3

Browse files
authored
Small change for wheel packaging (#2)
1 parent 3394767 commit 8c023a3

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

MANIFEST.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
include *.txt LICENSE CONTRIBUTING.md BUILDING.md CMakeLists.txt pyproject.toml couchbase_columnar_version.py pycbcc_build_setup.py
2-
include couchbase-sdk-python-black-duck-manifest.yaml
2+
include columnar-sdk-python-black-duck-manifest.yaml
3+
include couchbase_columnar/common/core/nonprod_certificates/*.pem
34
recursive-include couchbase_columnar *.py
45
recursive-include acouchbase_columnar *.py
56
recursive-include src *.[ch]xx

couchbase_columnar/common/core/_certificates.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ def get_nonprod_certificates() -> List[str]:
3030
Returns:
3131
List[str]: List of nonprod Capella certificates.
3232
"""
33+
import os
3334
import warnings
3435
from pathlib import Path
3536
warnings.warn('Only use non-prod certificate in DEVELOPMENT environments.', ResourceWarning)
3637
nonprod_cert_dir = Path(Path(__file__).resolve().parent, 'nonprod_certificates')
3738
nonprod_certs: List[str] = []
3839
for cert in nonprod_cert_dir.iterdir():
40+
if os.path.isdir(cert):
41+
continue
3942
nonprod_certs.append(cert.read_text())
4043
return nonprod_certs

couchbase_columnar/common/core/nonprod_certificates/__init__.py

Whitespace-only changes.

setup.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@
3535
PYCBCC_VERSION = couchbase_columnar_version.get_version()
3636

3737

38-
package_data = {}
38+
package_data = {'couchbase_columnar.common.core.nonprod_certificates': ['*.pem']}
3939
# some more Windows tomfoolery...
40-
# TODO: verify this works w/ cb2 updates
4140
if platform.system() == 'Windows':
42-
package_data = {'couchbase_columnar.protocol': ['pycbcc_core.pyd']}
41+
package_data.update(**{'couchbase_columnar.protocol': ['pycbcc_core.pyd']})
42+
4343

4444
print(f'Python Columnar SDK version: {PYCBCC_VERSION}')
4545

4646
setup(name='couchbase_columnar',
4747
version=PYCBCC_VERSION,
4848
ext_modules=[CMakeExtension('couchbase_columnar.protocol.pycbcc_core')],
4949
cmdclass={'build': BuildCommand, 'build_ext': CMakeBuildExt, 'configure_ext': CMakeConfigureExt},
50-
python_requires='>=3.7',
50+
python_requires='>=3.8',
5151
packages=find_packages(
5252
include=['acouchbase_columnar', 'couchbase_columnar', 'acouchbase_columnar.*', 'couchbase_columnar.*'],
5353
exclude=['acouchbase_columnar.tests', 'couchbase_columnar.tests']),

0 commit comments

Comments
 (0)