From ea41f971799f90ec094e1d9c4689f23d5f0fdb60 Mon Sep 17 00:00:00 2001
From: Bruce Flynn <brucef@ssec.wisc.edu>
Date: Thu, 5 Nov 2015 22:41:10 +0000
Subject: [PATCH] PyVer support
---
build.sh | 26 --------------------------
edosl0util/__init__.py | 14 +++++++++-----
setup.py | 5 +++++
3 files changed, 14 insertions(+), 31 deletions(-)
delete mode 100755 build.sh
diff --git a/build.sh b/build.sh
deleted file mode 100755
index cbdc108..0000000
--- a/build.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env bash
-
-function write_version_file() {
-# pull version out of setup.py
-version=$(grep version setup.py | sed "s,.*'\(.*\)'.*$,\1,g")
-cat <<EOF > edosl0util/version.txt
-__version__ = '${version}'
-__githash__ = '$(git log --format="%H" | head -n 1)'
-__patch__ = """$(git diff)"""
-EOF
-}
-
-if [ -z $1 ]
-then
- echo "USAGE: $0 sdist"
-fi
-
-case $1 in
- sdist)
- write_version_file
- python setup.py sdist $@
- ;;
- *)
- python setup.py $@
- ;;
-esac
diff --git a/edosl0util/__init__.py b/edosl0util/__init__.py
index 8b93517..27a54a5 100644
--- a/edosl0util/__init__.py
+++ b/edosl0util/__init__.py
@@ -1,6 +1,10 @@
+### PyVer Loader Start
import os
-version = os.path.join(os.path.split(__file__)[0], 'version.txt')
-if os.path.exists(version):
- execfile(version)
-del os
-del version
+verfile = 'edosl0util/version.txt'
+if os.path.exists(verfile):
+ execfile(verfile)
+else:
+ __version__ = '<unknown>'
+ __githash__ = ''
+del verfile
+### PyVer Loader End
diff --git a/setup.py b/setup.py
index 90f3584..cd25948 100644
--- a/setup.py
+++ b/setup.py
@@ -8,6 +8,11 @@ setup(
version='0.6.dev',
zip_safe=False,
packages=find_packages(),
+ pyver=True,
+ dependency_links=['https://sips.ssec.wisc.edu/eggs/packages'],
+ setup_requires=[
+ 'PyVer',
+ ],
install_requires=[
'h5py',
],
--
GitLab