Merge pull request #63 from changliao1025/development

add cmake into meta

Dockerfile

@@ -0,0 +1,15 @@
+FROM continuumio/miniconda3:latest
+
+RUN apt-get update && \
+    apt-get install -y cmake && \
+    rm -rf /var/lib/apt/lists/*
+
+COPY environment.yml .
+
+RUN conda env create -f environment.yml && \
+    conda clean -afy && \
+    rm -rf /opt/conda/pkgs/*
+
+ENV PATH /opt/conda/envs/hexwatershed/bin:$PATH
+
+CMD ["/bin/bash"]

meta.yaml

@@ -1,25 +1,32 @@
 package:
   name: "hexwatershed"
-  version: "0.2.12"
+  version: "0.2.13"
 
 source:
-  git_rev: v0.2.12
+  git_rev: v0.2.13
   git_url: https://github.com/changliao1025/pyhexwatershed
 
 build:
+  number: 0
   # Define custom build commands
   host:
     platform: linux-64
   script:
+    - cmake
+    - make
     - python setup.py build_external 
   # Build the package for macOS (64-bit)
   host:
     platform: osx-64
   script:
+   - cmake
+    - make
     - python setup.py build_external 
   host:
     platform: win-64
   script:
+    - cmake
+    - make
     - python setup.py build_external 
 
 requirements:
@@ -28,6 +35,8 @@ requirements:
     - osx-64
     - win-64
   build:
+    - cmake
+    - make
     - python    
     - packaging
     - setuptool

setup.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.2.12
+current_version = 0.2.13
 commit = True
 tag = True
 

setup.py

@@ -13,7 +13,7 @@
 AUTHOR = "Chang Liao"
 AUTHOR_EMAIL = "chang.liao@pnnl.gov"
 URL = "https://github.com/changliao1025/pyhexwatershed"
-VERSION = "0.2.12"
+VERSION = "0.2.13"
 REQUIRES_PYTHON = ">=3.8.0"
 KEYWORDS = "hexwatershed hexagon"