Merge pull request spyder-ide#55 from jitseniesen/fix-setup

PR: Fix version logic in setup.py
jitseniesen · Jan 29, 2017 · c414ace · c414ace
2 parents fbd1e8f + ab60f8c
commit c414ace
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -56,7 +56,7 @@ install:
   # Use Astropy ci helpers for initial setup
   - git clone git://github.com/astropy/ci-helpers.git
   - source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh
-  - $CONDA_INSTALL ciocheck -c conda-forge
+  - $CONDA_INSTALL ciocheck -c spyder-ide
   - python setup.py develop
   - spyder --reset
   - spyder

diff --git a/appveyor.yml b/appveyor.yml
@@ -82,7 +82,7 @@ install:
   - if "%USE_QT_API%" == "PySide2" conda install qt=5.* pyside2
   - if "%USE_QT_API%" == "PyQt4" conda install qt=4.* pyqt=4.*
   - if "%USE_QT_API%" == "PySide" conda install qt=4.* pyside
-  - "conda install ciocheck -c conda-forge"
+  - "conda install ciocheck -c spyder-ide"
   - "python setup.py develop"
   - "spyder --reset"
   - "spyder"

diff --git a/circle.yml b/circle.yml
@@ -22,7 +22,7 @@ dependencies:
       source ci-helpers/travis/setup_conda_$TRAVIS_OS_NAME.sh &&
       export PATH="$HOME/miniconda/bin:$PATH" &&
       source activate test &&
-      conda install ciocheck -c conda-forge &&
+      conda install ciocheck -c spyder-ide &&
       python setup.py develop;
 
 test:

diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@ def get_version():
         for l in lines:
             if "__version__" in l:
                 version = l.split("=")[1].strip()
+                version = version.replace("'", '').replace('"', '')
                 return version
 
 def get_package_data(name, extlist):