Merge 1e1e2f2 into fc20a9b

.travis.yml

@@ -35,8 +35,6 @@ before_install:
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then python --version; fi
 - pip install -U pip
 - pip install -U wheel
-- pip wheel numpy
-- pip install numpy
 - pip install twine
 - pip install -r requirements.txt
 install:

CHANGELOG.md

@@ -4,6 +4,14 @@ All notable changes to SpiceyPy will be documented here
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project tries to adhere to [Semantic Versioning](http://semver.org/).
 
+## [2.2.1] - 2019-08-19
+### Changed
+- set numpy version to 1.16.4 for python 2
+- other dependency changes to setup.py and requirements.txt
+
+### Fixed
+- typo in a unit test fixed
+
 ## [2.2.0] - 2019-02-24
 ### Added
 - gfevnt wrapper

appveyor.yml

@@ -52,8 +52,8 @@ install:
   - set PATH=%PYTHON%\\scripts;%PATH%
 
   # Download things we absolutely need
-  - pip install wheel twine six pytest
-  - pip install numpy
+  - pip install wheel twine
+  - pip install -r requirements.txt
 
   # Now install spiceypy
   - IF "%ARCH%"=="32" (call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86) ELSE (ECHO "probably a 64bit build")

docs/conf.py

@@ -71,9 +71,9 @@ def __getattr__(cls, name):
 # built documents.
 #
 # The short X.Y version.
-version = '2.2.0'
+version = '2.2.1'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.0'
+release = '2.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

requirements.txt

@@ -1,5 +1,7 @@
-numpy>=1.8.0
+numpy>=1.17.0; python_version >= "3.5"
+numpy<=1.16.4; python_version < "3.5"
 six>=1.9.0
 pytest>=2.9.0
 coverage>=4.0
-coveralls>=1.1
+coveralls>=1.1
+setuptools>=38.0.0

setup.py

@@ -46,8 +46,8 @@
 # Make the directory path for cspice/lib
 lib_dir = os.path.join(cspice_dir, 'lib')
 
-TEST_DEPENDENCIES = ['numpy>=1.12.0', 'six>=1.9.0', 'pytest>=2.9.0']
-DEPENDENCIES = ['numpy>=1.12.0', 'six>=1.9.0', 'certifi>=2017.1.23']
+TEST_DEPENDENCIES = ['setuptools>=38.0.0','numpy<=1.16.4;python_version<"3.5"', 'numpy>=1.17.0;python_version>="3.5"', 'six>=1.9.0', 'pytest>=2.9.0']
+DEPENDENCIES = ['setuptools>=38.0.0','numpy<=1.16.4;python_version<"3.5"', 'numpy>=1.17.0;python_version>="3.5"', 'six>=1.9.0', 'certifi>=2017.1.23']
 REQUIRES = ['numpy', 'six']
 
 # If we have an old version of OpenSSL, CSPICE will be downloaded
@@ -294,23 +294,25 @@ def get_tag(self):
 
 setup(
     name='spiceypy',
-    version='2.2.0',
+    version='2.2.1',
     license='MIT',
     author='Andrew Annex',
     author_email='ama6fy@virginia.edu',
     description='A Python Wrapper for the NAIF CSPICE Toolkit',
     long_description=readmetext,
+    python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
     keywords=['spiceypy', 'spice', 'naif', 'jpl', 'space', 'geometry'],
     url='https://github.com/AndrewAnnex/SpiceyPy',
     classifiers=[
-        "Development Status :: 4 - Beta",
+        "Development Status :: 5 - Production/Stable",
         "Natural Language :: English",
         "Topic :: Scientific/Engineering",
         "Topic :: Scientific/Engineering :: Astronomy",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Operating System :: MacOS :: MacOS X",
         "Operating System :: POSIX :: Linux",
         "Operating System :: POSIX :: BSD :: FreeBSD",