From 927dd99501942edb67816128d889ed02b0db7af8 Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Wed, 10 May 2023 16:05:35 -0700 Subject: [PATCH 1/3] add setup requires --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index d53878f..860e864 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,6 @@ import os import subprocess import shutil - from setuptools import setup, find_packages, Command from packaging import version @@ -190,6 +189,7 @@ def run(self): keywords=KEYWORDS, url=URL, data_files=data_files, + setup_requires=['setuptools','packaging'], packages=['pyhexwatershed'], package_data={ "pyhexwatershed": ["_bin/*", "_lib/*"] From 7832d0005e8e487a0c8b877fb3b022cc611dc542 Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Wed, 10 May 2023 16:06:02 -0700 Subject: [PATCH 2/3] remove packaging from dep --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 860e864..dbf923e 100644 --- a/setup.py +++ b/setup.py @@ -17,7 +17,6 @@ KEYWORDS = "hexwatershed hexagon" REQUIRED = [ - "packaging", "numpy", "matplotlib", "gdal", From 63ef35b8169aea592d5fe1cbfc10c5a5639d37dd Mon Sep 17 00:00:00 2001 From: changliao1025 Date: Wed, 10 May 2023 16:09:43 -0700 Subject: [PATCH 3/3] remove packaging --- meta.yaml | 4 ++-- setup.cfg | 2 +- setup.py | 18 ++++++------------ 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/meta.yaml b/meta.yaml index b0a54dc..fb0db99 100644 --- a/meta.yaml +++ b/meta.yaml @@ -1,9 +1,9 @@ package: name: "hexwatershed" - version: "0.2.19" + version: "0.2.20" source: - git_rev: v0.2.19 + git_rev: v0.2.20 git_url: https://github.com/changliao1025/pyhexwatershed build: diff --git a/setup.cfg b/setup.cfg index 4e5c830..1aa92bb 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.19 +current_version = 0.2.20 commit = True tag = True diff --git a/setup.py b/setup.py index dbf923e..12bb4d9 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import subprocess import shutil from setuptools import setup, find_packages, Command -from packaging import version + NAME = "hexwatershed" DESCRIPTION = \ @@ -12,7 +12,7 @@ AUTHOR = "Chang Liao" AUTHOR_EMAIL = "chang.liao@pnnl.gov" URL = "https://github.com/changliao1025/pyhexwatershed" -VERSION = "0.2.19" +VERSION = "0.2.20" REQUIRES_PYTHON = ">=3.8.0" KEYWORDS = "hexwatershed hexagon" @@ -149,19 +149,13 @@ def run(self): self.announce("cmake complie", level=3) ver = get_cmake_version() - if version.parse(ver) < version.parse("3.12"): - compilecall = [ + + compilecall = [ "cmake", "--build", ".", "--config", "Release", "--target", "install" ] - else: - compilecall = [ - "cmake", "--build", ".", - "--config", "Release", - "--target", "install", - "--parallel", "4" - ] + subprocess.run(compilecall, check=True) @@ -188,7 +182,7 @@ def run(self): keywords=KEYWORDS, url=URL, data_files=data_files, - setup_requires=['setuptools','packaging'], + setup_requires=['setuptools'], packages=['pyhexwatershed'], package_data={ "pyhexwatershed": ["_bin/*", "_lib/*"]