Merge pull request #32 from CDAT/new_license

added license moved recipe into repo

.circleci/config.yml

@@ -68,13 +68,13 @@ aliases:
        export USER=cdat
        export VERSION=8.0
        export LABEL=nightly
-       python ./prep_for_build.py -l $VERSION
-       if [[ $PY_VER = 'py2' ]]; then
-          conda build $PKG_NAME $CHANNELS
-       else
-          conda build $PKG_NAME $CHANNELS --python=3.6
+       if [[ -d $PKG_NAME ]]; then
+          rm -rf $PKG_NAME
        fi
-       anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL $CONDA_BLD_PATH/$OS/$PKG_NAME-$VERSION.`date +%Y*`0.tar.bz2 --force
+       ln -s ../recipe $PKG_NAME
+       python ./prep_for_build.py -l $VERSION
+       conda build $PKG_NAME $CHANNELS
+       anaconda -t $CONDA_UPLOAD_TOKEN upload -u $USER -l $LABEL $CONDA_BLD_PATH/noarch/$PKG_NAME-$VERSION.`date +%Y*`0.tar.bz2 --force
 
   - &run_coveralls
     name: run_coveralls
@@ -98,7 +98,6 @@ jobs:
       - run: *create_conda_env
       - run: *setup_cdutil
       - run: *run_cdutil_tests
-      - run: *conda_upload
       - store_artifacts:
           path: tests_html
           destination: tests_html
@@ -116,7 +115,6 @@ jobs:
       - run: *create_conda_env
       - run: *setup_cdutil
       - run: *run_cdutil_tests
-      - run: *conda_upload
       - store_artifacts:
           path: tests_html
           destination: tests_html
@@ -134,7 +132,6 @@ jobs:
       - run: *create_conda_env
       - run: *setup_cdutil
       - run: *run_cdutil_tests
-      - run: *conda_upload
       - store_artifacts:
           path: tests_html
           destination: tests_html
@@ -146,7 +143,7 @@ jobs:
       WORKDIR: "workspace/test_linux_cdutil_py3"
       OS: "linux-64"
       PY_VER: "py3"
-      COVERAGE: "-c tests/coverage.json"
+      COVERAGE: "-c tests/coverage.json --coverage-from-egg"
     steps:
       - checkout
       - run: *setup_miniconda
@@ -175,4 +172,4 @@ workflows:
 
 
 
-
+

bsd-3-clause.txt

@@ -0,0 +1,29 @@
+BSD 3-Clause License
+
+Copyright (c) 2018, Lawrence Livermore National Security, LLC
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Lib/create_landsea_mask.py → cdutil/create_landsea_mask.py

@@ -2,6 +2,9 @@
 import MV2
 import os
 import cdat_info
+import pkg_resources
+
+egg_path = pkg_resources.resource_filename(pkg_resources.Requirement.parse("cdutil"), "share/cdutil")
 
 
 def create_surrounds(data):
@@ -199,9 +202,7 @@ def generateLandSeaMask(target, source=None, threshold_1=.2,
     if source is None:
         source = cdms2.open(
             os.path.join(
-                cdat_info.get_prefix(),
-                'share',
-                'cdutil',
+                egg_path,
                 'navy_land.nc'))('sftlf')
 
     try:

Lib/sftbyrgn.py → cdutil/sftbyrgn.py

@@ -10,6 +10,10 @@
 import cdms2
 import os
 import cdat_info
+import pkg_resources
+
+
+egg_path = pkg_resources.resource_filename(pkg_resources.Requirement.parse("cdutil"), "share/cdutil")
 
 
 def sumregions(potential_reg, potential):
@@ -85,9 +89,7 @@ def generateSurfaceTypeByRegionMask(mask, sftbyrgn=None, sftbyrgnmask=215, regio
     if sftbyrgn is None:
         sftbyrgn = cdms2.open(
             os.path.join(
-                cdat_info.get_prefix(),
-                'share',
-                'cdutil',
+                egg_path,
                 'sftbyrgn.nc'))('sftbyrgn')
 
     if regions is None:

recipe/meta.yaml.in

@@ -0,0 +1,28 @@
+package:
+    name: cdutil
+    version: @VERSION@
+
+source:
+    git_rev: @UVCDAT_BRANCH@
+    git_url: git://github.com/CDAT/cdutil.git
+
+build:
+  number: @BUILD_NUMBER@
+  noarch: python
+  script: python setup.py install
+
+requirements:
+  build:
+    - python
+    - setuptools
+  run:
+    - python
+    - cdms2
+    - genutil
+
+about:
+    home:  http://github.com/CDAT/cdutil
+    summary: A set of tools to manipulate climate data
+    license: BSD
+    license_file: bsd-3-clause.txt
+

setup.py

@@ -1,18 +1,29 @@
-from distutils.core import setup
+from setuptools import setup, find_packages
+from subprocess import Popen, PIPE
+
+
+Version = "8.0"
+p = Popen(
+    ("git",
+     "describe",
+     "--tags"),
+    stdin=PIPE,
+    stdout=PIPE,
+    stderr=PIPE)
 try:
-    sys.path.append(os.environ['BUILD_DIR'])
-    import cdat_info
-    Version=cdat_info.Version
+    descr = p.stdout.readlines()[0].strip().decode("utf-8")
+    Version = "-".join(descr.split("-")[:-2])
+    if Version == "":
+        Version = descr
 except:
-    Version="???"
+    descr = Version
 
 setup (name = "cdutil",
-       author="PCMDI Software Team",
-       version=Version,
+       author="AIMS Software Team",
+       version=descr,
        description = "Utilities for climate data manipulation",
        url = "http://cdat.sourceforge.net",
-       packages = ['cdutil'],
-       package_dir = {'cdutil': 'Lib'},
+       packages = find_packages(),
        data_files = [ ("share/cdutil",("data/sftbyrgn.nc","data/navy_land.nc","share/test_data_files.txt"))],
       )
 

tests/test_cdutil_flake8.py

@@ -23,7 +23,7 @@ def testFlake8(self):
         print()
         print()
         print()
-        P = subprocess.Popen(shlex.split("flake8 --show-source --statistics --ignore=F999,F405,E121,E123,E126,E226,E24,E704 --max-line-length=120 %s" % pth),
+        P = subprocess.Popen(shlex.split("flake8 --show-source --statistics --ignore=F999,F405,E121,E123,E126,E226,E24,E704,W504 --max-line-length=120 %s" % pth),
                              stdin=subprocess.PIPE,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)

tests/test_cdutil_gen_mask.py

@@ -1,11 +1,13 @@
 import cdms2,sys,cdutil,os,cdat_info
 import unittest
 import numpy
+import pkg_resources
+egg_path = pkg_resources.resource_filename(pkg_resources.Requirement.parse("cdutil"), "share/cdutil")
 
 class CDUTIL(unittest.TestCase):
     def testGenmask(self):
 
-        f=cdms2.open(os.path.join(sys.prefix,"share","cdutil","navy_land.nc"))
+        f=cdms2.open(os.path.join(egg_path, "navy_land.nc"))
         navy_frac_one = f('sftlf')
         g = navy_frac_one.getGrid()
         print(("SOURCE GRID:",g))