From be62d1a6c896b46a482d6cd2257e7b27d18b18d0 Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Mon, 8 May 2023 18:50:01 -0700 Subject: [PATCH 1/2] fix rmtre error --- meta.yaml | 4 ++-- setup.cfg | 2 +- setup.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta.yaml b/meta.yaml index aa316d4..f7381d4 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: "hexwatershed" - version: "0.2.1" + version: "0.2.2" source: - git_rev: v0.2.1 + git_rev: v0.2.2 git_url: https://github.com/changliao1025/pyhexwatershed build: diff --git a/setup.cfg b/setup.cfg index d5baee0..a62f669 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.1 +current_version = 0.2.2 commit = True tag = True diff --git a/setup.py b/setup.py index 22155e4..b24608f 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ AUTHOR = "Chang Liao" AUTHOR_EMAIL = "chang.liao@pnnl.gov" URL = "https://github.com/changliao1025/pyhexwatershed" -VERSION = "0.2.1" +VERSION = "0.2.2" REQUIRES_PYTHON = ">=3.8.0" KEYWORDS = "hexwatershed hexagon" @@ -88,7 +88,7 @@ def run(self): source_path = os.path.join( HERE, "external", "hexwatershed") # Run the command using subprocess - shutil.rmtree(source_path) + shutil.rmtree(source_path, ignore_errors=True) subprocess.run(git_command.split(), check=True) From 064f746ed53a31ef32127c33c28f1758b402263c Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Mon, 8 May 2023 18:54:17 -0700 Subject: [PATCH 2/2] path issue --- meta.yaml | 4 ++-- setup.cfg | 2 +- setup.py | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta.yaml b/meta.yaml index f7381d4..82e4169 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: "hexwatershed" - version: "0.2.2" + version: "0.2.3" source: - git_rev: v0.2.2 + git_rev: v0.2.3 git_url: https://github.com/changliao1025/pyhexwatershed build: diff --git a/setup.cfg b/setup.cfg index a62f669..bdeaba1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.2 +current_version = 0.2.3 commit = True tag = True diff --git a/setup.py b/setup.py index b24608f..b74503a 100644 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ AUTHOR = "Chang Liao" AUTHOR_EMAIL = "chang.liao@pnnl.gov" URL = "https://github.com/changliao1025/pyhexwatershed" -VERSION = "0.2.2" +VERSION = "0.2.3" REQUIRES_PYTHON = ">=3.8.0" KEYWORDS = "hexwatershed hexagon" @@ -88,7 +88,8 @@ def run(self): source_path = os.path.join( HERE, "external", "hexwatershed") # Run the command using subprocess - shutil.rmtree(source_path, ignore_errors=True) + if os.path.exists(source_path): + shutil.rmtree(source_path, ignore_errors=True) subprocess.run(git_command.split(), check=True)