From 039dd492cbc4f450e1e10fcd67ad4b7c9b940cee Mon Sep 17 00:00:00 2001
From: jay <jlaura@usgs.gov>
Date: Mon, 19 Sep 2016 14:13:16 -0700
Subject: [PATCH] trying to get broken build fixed
---
conda/build.sh | 2 --
conda/meta.yaml | 25 +++++++++++++++++++------
setup.py | 7 +++++--
3 files changed, 24 insertions(+), 10 deletions(-)
delete mode 100755 conda/build.sh
diff --git a/conda/build.sh b/conda/build.sh
deleted file mode 100755
index 4dad93a..0000000
--- a/conda/build.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-$PYTHON setup.py install
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 08523fa..18fbf12 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -2,16 +2,22 @@ package:
name: plio
version: 0.1.0
-source:
- git_url: https://github.com/USGS-Astrogeology/plio.git
+source:
+ path: ../
+
+build:
+ number: 0
+ skip: true #[win]
+ script: python setup.py install --single-version-externally-managed --record=record.txt
requirements:
- build:
- - python
+ build:
+ - python
+ - setuptools
- numpy
- pvl
- protobuf 3.0.0b2
- - gdal >=2
+ - gdal
- icu
- h5py
- pandas
@@ -19,14 +25,21 @@ requirements:
- pyyaml
run:
- python
+ - setuptools
- numpy
- pvl
- protobuf 3.0.0b2
- - gdal >=2
+ - gdal
- icu
- h5py
- pandas
- sqlalchemy
- pyyaml
+test:
+ imports:
+ - plio
+about:
+ home: http://github.com/USGS-Astrogeology/plio
+ license: Public Domain
diff --git a/setup.py b/setup.py
index 61e417d..2299302 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ def setup_package():
else:
glob_name = 'examples/' + i + '/*'
examples.add(glob_name)
-
+
setup(
name = "plio",
version = VERSION,
@@ -38,12 +38,15 @@ def setup_package():
zip_safe=False,
install_requires=[
'gdal>=2',
+ 'numpy',
'pvl',
'protobuf==3.0.0b2',
'h5py',
+ 'icu,'
'pandas',
'sqlalchemy',
- 'pyyaml'],
+ 'pyyaml',
+ 'certifi'],
classifiers=[
"Development Status :: 3 - Alpha",
"Topic :: Utilities",
--
GitLab