From c4cf83504b267e00f98c78eddba9a3704eba1b23 Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Wed, 10 May 2023 13:53:41 -0700 Subject: [PATCH] specify data folder --- meta.yaml | 4 ++-- setup.cfg | 2 +- setup.py | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta.yaml b/meta.yaml index 10a0ee8..f373b64 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: "hexwatershed" - version: "0.2.17" + version: "0.2.18" source: - git_rev: v0.2.17 + git_rev: v0.2.18 git_url: https://github.com/changliao1025/pyhexwatershed build: diff --git a/setup.cfg b/setup.cfg index ec3b89f..3902d76 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.17 +current_version = 0.2.18 commit = True tag = True diff --git a/setup.py b/setup.py index 7fdc022..5e06e9b 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.17" +VERSION = "0.2.18" REQUIRES_PYTHON = ">=3.8.0" KEYWORDS = "hexwatershed hexagon" @@ -38,17 +38,17 @@ "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" - ]) +data_files=[ ( 'external/hexwatershed/', [ "external/hexwatershed/CMakeLists.txt"]) , + ( "external/hexwatershed/src", ["external/hexwatershed/src/*.h", "external/hexwatershed/src/*.cpp"] ), + ( "external/hexwatershed/src/compset/", ["external/hexwatershed/src/compset/*.h", "external/hexwatershed/src/compset/*.cpp"] ), + ( "external/hexwatershed/src/domain/" , ["external/hexwatershed/src/domain/*.h", "external/hexwatershed/src/domain/*.cpp"] ), + ( "external/hexwatershed/src/json/" , ["external/hexwatershed/src/json/*.h", "external/hexwatershed/src/json/*.cpp"] ), + ( "external/rapidjson/" , ["external/rapidjson/*.h", "external/rapidjson/*.cpp"] ), + ( "external/rapidjson/error/" , ["external/rapidjson/error/*.h", "external/rapidjson/error/*.cpp"] ), + ( "external/rapidjson/internal/" , ["external/rapidjson/internal/*.h", "external/rapidjson/internal/*.cpp"] ), + ( "external/rapidjson/msinttypes/" , ["external/rapidjson/msinttypes/*.h", "external/msinttypes/error/*.cpp"] ) ] + HERE = os.path.abspath(os.path.dirname(__file__)) HERE = os.path.expandvars(HERE)