From c0ca2ad68cd30d7a7df86f07e1766c4a4a823f17 Mon Sep 17 00:00:00 2001
From: Jay <jlaura@usgs.gov>
Date: Mon, 25 Mar 2019 21:29:07 -0700
Subject: [PATCH] Fixes travis upload error and version check
---
.travis.yml | 2 +-
plio/__init__.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ae8bb6f..96bf55c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -55,7 +55,7 @@ after_success:
- conda install -q conda-build anaconda-client
- conda config --set anaconda_upload no
- conda build recipe -q
- - buildir=(`conda build recipe --output`)
+ - builddir=(`conda build recipe --output`)
- anaconda -t="$CONDA_UPLOAD_TOKEN" upload $builddir --label dev --force;
# Docs to gh-pages
diff --git a/plio/__init__.py b/plio/__init__.py
index 1269de6..eca43e4 100755
--- a/plio/__init__.py
+++ b/plio/__init__.py
@@ -9,10 +9,9 @@ try:
if not here.startswith(os.path.join(dist_loc, 'plio')):
# not installed, but there is another version that *is*
raise DistributionNotFound
+ __version__ = _dist.version
except DistributionNotFound:
__version__ = 'Please install this project with setup.py'
-else:
- __version__ = _dist.version
# Submodule imports
from . import io
--
GitLab