fixed setup and conda files

coecms · Mar 1, 2022 · 86c2bae · 86c2bae
1 parent f5e6ea1
commit 86c2bae
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 25 deletions.
diff --git a/conda/.condarc b/conda/.condarc
diff --git a/conda/bld.bat b/conda/bld.bat
diff --git a/conda/build.sh b/conda/build.sh
diff --git a/conda/meta.yml → conda/meta.yaml b/conda/meta.yml → conda/meta.yaml
@@ -6,7 +6,7 @@ package:
 about:
     home: https://github.com/coecms/xmhw
     license: Apache-2.0
-    license_file: LICENSE-2.0.txt
+    license_file: LICENSE.txt
     summary: "Xarray based Marine HeatWave detection code"
     description: |
       XMHW identifies marine heatwaves from a timseries of 
@@ -18,10 +18,11 @@ about:
 
 requirements:
     host:
-        - python >= 3.7
+        - python >=3.7
         - pip
+        - pbr
     run:
-        - python >= 3.7
+        - python >=3.7
         - pandas
         - xarray
         - numpy
@@ -31,14 +32,16 @@ source:
     url:  https://github.com/coecms/xmhw/archive/refs/tags/{{version}}.tar.gz 
 
 build:
+    script: "{{ PYTHON }} -m pip install . --no-deps --ignore-installed"
+    noarch: python
     number: {{ GIT_DESCRIBE_NUMBER }}
-    script: python setup.py install --single-version-externally-managed --record=record.txt
 
 test:
     source_files:
         - setup.cfg
         - test
     requires:
+        - netcdf4
         - pytest
         - coverage
         - numpy
@@ -47,6 +50,8 @@ test:
         - dask
     imports:
         - xmhw
+    script_env:
+        - TEST_OUTPUT
     commands:
         - COVERAGE_FILE=${TEST_OUTPUT:-.}/coverage coverage run --source xmhw -m pytest ./test
 
diff --git a/conda/run_test.sh b/conda/run_test.sh
diff --git a/conda/run_test_coverage.sh b/conda/run_test_coverage.sh
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,7 @@
 [metadata]
 name = xmhw 
 url = https://github.com/coecms/xmhw
+version = 0.8.0
 author = Paola Petrelli
 author_email = [email protected]
 summary = 'Marine heatwave detection code using xarray' 
@@ -18,16 +19,6 @@ classifier =
     Programming Language :: Python :: 3.9 
     Programming Language :: Python :: 3.10 
 
-[options]
-install_requires =
-    xarray
-    numpy
-    pandas
-    dask
-tests_require =
-    netCDF4
-
-python_requires =  >= 3.7
 
 [files]
 packages = 

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 from setuptools import setup
 
 setup(
-        setup_requires=['pbr>=1.9', 'setuptools>=17.1'],
+        setup_requires=['pbr', 'setuptools'],
         pbr=True,
         )