Provides hyperspy 1.7.0

2 files changed, 23 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9155b678c0db..8674a326a128 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-hyperspy
 	pkgdesc = Hyperspectral data analysis
-	pkgver = 1.6.5
+	pkgver = 1.7.0
 	pkgrel = 2
 	url = http://hyperspy.org
 	arch = any
@@ -13,8 +13,7 @@ pkgbase = python-hyperspy
 	makedepends = python-setuptools
 	depends = python
 	depends = python-scipy>=1.1
-	depends = python-matplotlib>=3.1.0
-	depends = python-matplotlib<3.5
+	depends = python-matplotlib>=3.1.3
 	depends = python-numpy>=1.17.1
 	depends = python-traits>=4.5.0
 	depends = python-natsort
@@ -22,16 +21,24 @@ pkgbase = python-hyperspy
 	depends = python-tqdm>=4.9.0
 	depends = python-sympy
 	depends = python-h5py>=2.3
+	depends = python-jinja
+	depends = python-packaging
 	depends = python-dateutil>=2.5.0
+	depends = python-ipython>=8.1.0
 	depends = python-dask>2.1.0
 	depends = python-pint>=0.10
 	depends = python-numexpr
 	depends = python-pyaml
 	depends = python-prettytable
+	depends = python-importlib-metadata>=3.6
+	depends = python-toolz
 	depends = python-dill
 	depends = python-ipyparallel
 	depends = python-scikit-image>=0.15
 	depends = python-sparse
+	depends = python-zarr
+	depends = python-tifffile>=2020.2.16
+	depends = python-numba>=0.52
 	optdepends = python-scikit-learn: machine learning features
 	optdepends = python-hyperspy-gui-ipywidgets: GUI components for Jupyter
 	optdepends = python-hyperspy-gui-traitsui: GUI components for desktop
@@ -44,7 +51,7 @@ pkgbase = python-hyperspy
 	provides = hyperspy
 	conflicts = hyperspy
 	replaces = hyperspy
-	source = https://github.com/hyperspy/hyperspy/archive/v1.6.5.tar.gz
-	md5sums = 67aebe07b41f1bd945b0edaae0e8f976
+	source = https://github.com/hyperspy/hyperspy/archive/v1.7.0.tar.gz
+	md5sums = e5eafa10c3f8d630e1ab16eb478c6b72
 
 pkgname = python-hyperspy
diff --git a/PKGBUILD b/PKGBUILD
index 12f29f90284a..2f8df9344d25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Joshua Taillon <jat255 AT gmail DOT com>
 pkgname=python-hyperspy
 pkgshort=hyperspy
-pkgver=1.6.5
+pkgver=1.7.0
 pkgrel=2
 pkgdesc="Hyperspectral data analysis"
 arch=('any')
@@ -12,8 +12,7 @@ license=('GPL3')
 
 depends=('python'
          'python-scipy>=1.1'
-         'python-matplotlib>=3.1.0'
-         'python-matplotlib<3.5'
+         'python-matplotlib>=3.1.3'
          'python-numpy>=1.17.1'
          'python-traits>=4.5.0'
          'python-natsort'
@@ -21,20 +20,26 @@ depends=('python'
          'python-tqdm>=4.9.0'
          'python-sympy'
          'python-h5py>=2.3'
+         'python-jinja'
+ 	 'python-packaging'
          'python-dateutil>=2.5.0'
+	 'python-ipython>=8.1.0'
          'python-dask>2.1.0'
          'python-pint>=0.10'
          'python-numexpr'
          'python-pyaml'
          'python-prettytable'
+	 'python-importlib-metadata>=3.6'
+         'python-toolz'
          'python-dill'  # AUR
          'python-ipyparallel'  # AUR
          'python-scikit-image>=0.15'  # AUR
          'python-sparse'  # AUR
+	 'python-zarr'  # AUR
        # 'python-imageio'  # AUR (from scikit-image)
        # 'python-pywavelets' # AUR (from scikit-image)
-       # 'python-tifffile>=2019.12.3'  # AUR (from scikit-image)        
-       # 'python-numba'  # AUR (from python-sparse)
+         'python-tifffile>=2020.2.16'  # AUR (from scikit-image)        
+         'python-numba>=0.52'  # AUR (from python-sparse)
        # 'python-llvmlite' # AUR (from python-numba)
        # 'python-llvmlite-bin' # AUR (from python-numba, but require bin package to avoid version mismatches)
          )
@@ -69,5 +74,4 @@ package() {
   cd "$srcdir/$pkgshort-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
 }
-
-md5sums=('67aebe07b41f1bd945b0edaae0e8f976')
+md5sums=('e5eafa10c3f8d630e1ab16eb478c6b72')