From 709229ddda53026c10b2e042f55253d19bb6f0a1 Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Wed, 10 May 2023 10:59:03 -0700 Subject: [PATCH] add all subf --- MANIFEST.in | 15 ++++++++++++++- meta.yaml | 4 ++-- setup.cfg | 2 +- setup.py | 18 ++++++++++++++---- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/MANIFEST.in b/MANIFEST.in index 4185623..7c8e65e 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,8 +4,21 @@ include HISTORY.rst include LICENSE include README.rst -include external/hexwatershed/* +include external/hexwatershed/*.txt +include external/hexwatershed/src/* +include external/hexwatershed/src/compset/*.h +include external/hexwatershed/src/compset/*.cpp +include external/hexwatershed/src/domain/*.h +include external/hexwatershed/src/domain/*.cpp +include external/hexwatershed/src/json/*.h +include external/hexwatershed/src/json/*.cpp include external/rapidjson/* +include external/rapidjson/error/*.h +include external/rapidjson/error/*.cpp +include external/rapidjson/internal/*.h +include external/rapidjson/internal/*.cpp +include external/rapidjson/msinttypes/*.h +include external/rapidjson/msinttypes/*.cpp recursive-include tests * recursive-exclude * __pycache__ diff --git a/meta.yaml b/meta.yaml index 5aed723..2bfc263 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: "hexwatershed" - version: "0.2.11" + version: "0.2.12" source: - git_rev: v0.2.11 + git_rev: v0.2.12 git_url: https://github.com/changliao1025/pyhexwatershed build: diff --git a/setup.cfg b/setup.cfg index 9073465..f17a5cd 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.11 +current_version = 0.2.12 commit = True tag = True diff --git a/setup.py b/setup.py index 5eed474..ec99835 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ AUTHOR = "Chang Liao" AUTHOR_EMAIL = "chang.liao@pnnl.gov" URL = "https://github.com/changliao1025/pyhexwatershed" -VERSION = "0.2.11" +VERSION = "0.2.12" REQUIRES_PYTHON = ">=3.8.0" KEYWORDS = "hexwatershed hexagon" @@ -177,10 +177,20 @@ def run(self): python_requires=REQUIRES_PYTHON, keywords=KEYWORDS, url=URL, - packages=['pyhexwatershed', 'external'], + data_files=[('external', ["hexwatershed/*.txt", + "hexwatershed/src/*.h","hexwatershed/src/*.cpp", + "hexwatershed/src/compset/*.h","hexwatershed/src/compset/*.cpp", + "hexwatershed/src/domain/*.h","hexwatershed/src/domain/*.cpp", + "hexwatershed/src/json/*.h","hexwatershed/src/json/*.cpp", + "rapidjson/*.h", "rapidjson/*.cpp", + "rapidjson/error/*.h", "rapidjson/error/*.cpp", + "rapidjson/internal/*.h", "rapidjson/internal/*.cpp", + "rapidjson/msinttypes/*.h", "msinttypes/error/*.cpp" + ]) + ], + packages=['pyhexwatershed'], package_data={ - "pyhexwatershed": ["_bin/*", "_lib/*"], - "external": ["hexwatershed/*", "rapidjson/*"] + "pyhexwatershed": ["_bin/*", "_lib/*"] }, install_requires=REQUIRED, cmdclass={"build_external": build_external},