Merge pull request #62 from changliao1025/development

add all subf

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__

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:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.11
+current_version = 0.2.12
 commit = True
 tag = True
 

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},