Merge pull request #4 from INGEOTEC/develop

Version - 0.8.15

.travis.yml

@@ -10,6 +10,7 @@ env:
     - python=3.4  CONDA_PY=34    
     - python=3.5  CONDA_PY=35
     - python=3.6  CONDA_PY=36
+    - python=3.7  CONDA_PY=37
 
   global:
     - secure: "XQmxWjC2zCH7fR9Vxr0H3ISLV0OxqW7MoxslkZ38cQ+0/oB799rPVInOQt/715w37TMLs+ibzJKLEQyo4Gp5u5BqZBqOqz/ql0tAakRndMU21yX9BYuu5Yx3GidoRhbTkqZj2zjVxF/sFE4g9K4MRWYhVQyhkzEtWPVvs5eCYkRos8rPQ4vCP9ZnVW+aAjCNhmRqdjJrwNpVpvKaCg2COaRoQJei59fRW8i3hLJChZyBFXXM5Z692Yk4xpVPntCVowwkgZzlVVlUy/isiKziz4Otxnj20luFFro4ZLpUm3YgU7aeQWdh8pz1aIVvmGEiperTrY6y1ImGXyARDnr/JZ2/Xn9kGIHVaZWOF8YOSt18P94cuer+dTljoVOG4tu/wDUtWl5vndzkWF0aI3MJsfl82PB9qL7AFOeAxWQk1+pGCLvBy3A3XiCFLLGuptNjesGSPk7kkiuA7IKNLiI2dTEzn9vFuAfaKp7P1z+MLgtwTAhyybhRMhnCn7LO6/RWOSFUZAeK+ZIoUC1hDZbKQBG6TESrYHnlqFjYDw1XHnJZWF6bYox19ZACsjWhm3ODQ/ZehhFzF3KbqLZRLMoxdwbtcqVgzUutB3fkd0ULO4lB5n80Y1hQBzRdtS5ZKUbzKkIKtJTJAMSPS4EJvOypXAAD+SzQnFy3aSZsZjdyJmQ="
@@ -30,7 +31,12 @@ before_install:
   - pip install coveralls
   - conda config --append channels ingeotec  
   - conda install --yes nose cython
-  - python setup.py build_ext --inplace
+  - if [ $python = 2.7 ]; then python setup.py build_ext --inplace; fi
+  - if [ $python = 3.4 ]; then python setup.py build_ext --inplace; fi  
+  - if [ $python = 3.5 ]; then python setup.py build_ext --inplace; fi
+  - if [ $python = 3.7 ]; then python setup.py build_ext --inplace; fi
+  - if [ $python = 3.6 ]; then python setup_coverage.py build_ext --inplace; fi
+
 
 # command to run tests
 script:
@@ -40,11 +46,13 @@ script:
   - if [ $python = 2.7 ]; then nosetests --verbose -exe SparseArray; fi
   - if [ $python = 3.4 ]; then nosetests --verbose -exe SparseArray; fi  
   - if [ $python = 3.5 ]; then nosetests --verbose -exe SparseArray; fi
+  - if [ $python = 3.7 ]; then nosetests --verbose -exe SparseArray; fi
   - if [ $python = 3.6 ]; then coverage run setup_coverage.py nosetests; fi
 
 after_success:
   - if [ $python = 3.6 ]; then coveralls || echo "Coveralls upload failed"; fi
-  - if [ $TRAVIS_BRANCH = "master" -a $python = 3.6 ]; then python setup.py sdist; pip install twine; twine upload -u mgraffg -p $TWINE dist/*.tar.gz; fi  
+  - if [ $TRAVIS_BRANCH = "master" -a $python = 3.6 ]; then python setup.py sdist; pip install twine; twine upload -u mgraffg -p $TWINE dist/*.tar.gz; fi
+  - if [ $TRAVIS_BRANCH = "master" ]; then python setup.py bdist_wheel; pip install twine; twine upload -u mgraffg -p $TWINE dist/*.whl; fi    
   - if [ $TRAVIS_BRANCH = "master" ]; then source deactivate; conda install --yes pip conda-build jinja2 anaconda-client; conda build conda-recipe --quiet; fi
   - python continuous-integration/move-conda-package.py conda-recipe  
   - which binstar

SparseArray/__init__.py

@@ -14,4 +14,4 @@
 
 from .sparse_array import SparseArray
 __all__ = ["SparseArray"]
-__version__ = '0.8.14'
+__version__ = '0.8.15'

VERSION

@@ -1 +1 @@
-0.8.14
+0.8.15

appveyor.yml

@@ -50,6 +50,16 @@ environment:
       PYTHON_ARCH: "64"
       CONDA_PY: "36"
 
+    - PYTHON: "C:\\Python37_32"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "32"
+      CONDA_PY: "37"
+
+    - PYTHON: "C:\\Python37_64"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "64"
+      CONDA_PY: "37"
+
 install:
   # this installs the appropriate Miniconda (Py2/Py3, 32/64 bit),
   # as well as pip, conda-build, and the binstar CLI

continuous-integration/binstar-push.py

@@ -1,7 +1,8 @@
 import os
 import glob
-import subprocess
-import traceback
+# import subprocess
+# import traceback
+from binstar_client.scripts import cli
 
 
 def get_token():
@@ -13,9 +14,11 @@ def get_token():
 
 token = get_token()
 if token is not None:
-    cmd = ['binstar', '-t', token, 'upload', '--force']
+    cmd = ['-t', token, 'upload', '--force', '-u', 'ingeotec']
     cmd.extend(glob.glob('*.tar.bz2'))
-    try:
-        subprocess.check_call(cmd)
-    except subprocess.CalledProcessError:
-        traceback.print_exc()
+    cli.main(args=cmd)
+    # try:
+    #     print('*', cmd, platform.system())
+    #     subprocess.check_call(cmd)
+    # except subprocess.CalledProcessError:
+    #     traceback.print_exc()

setup.py

@@ -13,9 +13,8 @@
 # limitations under the License.
 # import numpy
 from setuptools import setup
-from Cython.Build import cythonize
 from os.path import join
-import os
+from Cython.Build import cythonize
 
 
 long_desc = 'SparseArray'
@@ -45,7 +44,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         "Topic :: Scientific/Engineering :: Artificial Intelligence"],
-    url='https://github.com/mgraffg',
+    url='https://github.com/INGEOTEC/SparseArray',
     author="Mario Graff",
     author_email="mgraffg@ieee.org",
     ext_modules=cythonize('SparseArray/sparse_array.pyx',