Merge pull request #70 from changliao1025/development

Development

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:

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.19
+current_version = 0.2.20
 commit = True
 tag = True
 

setup.py

@@ -3,22 +3,20 @@
 import os
 import subprocess
 import shutil
-
 from setuptools import setup, find_packages, Command
-from packaging import version
+
 
 NAME = "hexwatershed"
 DESCRIPTION = \
     "A mesh-independent flow direction model for hydrologic models"
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "[email protected]"
 URL = "https://github.com/changliao1025/pyhexwatershed"
-VERSION = "0.2.19"
+VERSION = "0.2.20"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = "hexwatershed hexagon"
 
 REQUIRED = [
-    "packaging",
     "numpy",
     "matplotlib",
     "gdal",
@@ -151,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)
 
@@ -190,6 +182,7 @@ def run(self):
     keywords=KEYWORDS,
     url=URL,
     data_files=data_files,
+    setup_requires=['setuptools'],
     packages=['pyhexwatershed'],
     package_data={
         "pyhexwatershed": ["_bin/*", "_lib/*"]