bumpy numpy version

sunpy · Mar 5, 2019 · 716c922 · 716c922
1 parent b37ea89
commit 716c922
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools", "setuptools_scm", "wheel", "numpy>=1.13.0"]
+requires = ["setuptools", "setuptools_scm", "wheel", "numpy==1.14.5"]
 
 [ tool.sunpy-bot ]
   # disable astropy checks

diff --git a/setup.cfg b/setup.cfg
@@ -21,7 +21,7 @@ packages = find:
 include_package_data = True
 setup_requires = setuptools_scm
 install_requires =
-  numpy>=1.13
+  numpy>=1.14.5
   scipy
   matplotlib>=1.3
   pandas

diff --git a/sunpy/__init__.py b/sunpy/__init__.py
@@ -13,7 +13,6 @@
 # This is the same check as the one at the top of setup.py
 import os
 import sys
-from pkg_resources import get_distribution, DistributionNotFound
 
 __minimum_python_version__ = "3.6"
 
@@ -33,8 +32,8 @@ class UnsupportedPythonError(Exception):
     builtins._SUNPY_SETUP_ = False
 
 try:
-    __version__ = get_distribution(__name__).version
-except DistributionNotFound:
+    from .version import version as __version__
+except ImportError:
     __version__ = ''
 
 if not _SUNPY_SETUP_:

diff --git a/tox.ini b/tox.ini
@@ -89,6 +89,6 @@ conda_deps =
     scipy
     sqlalchemy
     zeep
-conda_channels = sunpy
+conda_channels = conda-forge
 commands =
     pytest -m "not figure" --cov=./sunpy {posargs}