From ba449a9fcde729d41121ea337005c0f3c42cbbc8 Mon Sep 17 00:00:00 2001
From: changliao1025 <changliao1025@outlook.com>
Date: Wed, 10 May 2023 13:19:23 -0700
Subject: [PATCH] fix data files

---
 MANIFEST.in |  2 +-
 meta.yaml   |  4 ++--
 setup.cfg   |  2 +-
 setup.py    | 26 ++++++++++++++------------
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/MANIFEST.in b/MANIFEST.in
index 7c8e65e..63213d8 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,7 +4,7 @@ include HISTORY.rst
 include LICENSE
 include README.rst
 
-include external/hexwatershed/*.txt
+include external/hexwatershed/CMakeLists.txt
 include external/hexwatershed/src/*
 include external/hexwatershed/src/compset/*.h
 include external/hexwatershed/src/compset/*.cpp
diff --git a/meta.yaml b/meta.yaml
index 16f5bf0..7cd345a 100644
--- a/meta.yaml
+++ b/meta.yaml
@@ -1,9 +1,9 @@
 package:
   name: "hexwatershed"
-  version: "0.2.15"
+  version: "0.2.16"
 
 source:
-  git_rev: v0.2.15
+  git_rev: v0.2.16
   git_url: https://github.com/changliao1025/pyhexwatershed
 
 build:
diff --git a/setup.cfg b/setup.cfg
index 5868da0..81de0b5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.15
+current_version = 0.2.16
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index ff3bf9a..97c87b1 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.15"
+VERSION = "0.2.16"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = "hexwatershed hexagon"
 
@@ -38,6 +38,18 @@
     "Topic :: Scientific/Engineering :: Physics"
 ]
 
+data_files=[('external', [ "external/hexwatershed/CMakeLists.txt",
+                           "external/hexwatershed/src/*.h","external/hexwatershed/src/*.cpp",
+                           "external/hexwatershed/src/compset/*.h","external/hexwatershed/src/compset/*.cpp",
+                           "external/hexwatershed/src/domain/*.h","external/hexwatershed/src/domain/*.cpp",
+                           "external/hexwatershed/src/json/*.h","external/hexwatershed/src/json/*.cpp",
+                           "external/rapidjson/*.h", "external/rapidjson/*.cpp",
+                           "external/rapidjson/error/*.h", "external/rapidjson/error/*.cpp",
+                           "external/rapidjson/internal/*.h", "external/rapidjson/internal/*.cpp",
+                           "external/rapidjson/msinttypes/*.h", "external/msinttypes/error/*.cpp"
+                               ])
+                               ],
+
 HERE = os.path.abspath(os.path.dirname(__file__))
 HERE = os.path.expandvars(HERE)
 # Check if the expanded path exists
@@ -177,17 +189,7 @@ def run(self):
     python_requires=REQUIRES_PYTHON,
     keywords=KEYWORDS,
     url=URL,
-    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"
-                               ])
-                               ],
+    data_files=data_files,
     packages=['pyhexwatershed'],
     package_data={
         "pyhexwatershed": ["_bin/*", "_lib/*"]