Update to version 3.4.0

2 files changed, 59 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index abfed1926c0b..4efcae760ff8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,40 @@
 pkgbase = python-ginga
 	pkgdesc = A viewer for astronomical data FITS (Flexible Image Transport System) files.
-	pkgver = 3.3.0
+	pkgver = 3.4.0
 	pkgrel = 1
 	url = https://ejeschke.github.io/ginga
 	arch = any
 	license = BSD
 	checkdepends = python-pytest-astropy-header
-	checkdepends = python-astropy
+	checkdepends = python-photutils
+	checkdepends = python-pillow
+	checkdepends = python-scipy
+	checkdepends = python-astlib
 	makedepends = python-setuptools-scm
 	makedepends = python-wheel
 	makedepends = python-build
 	makedepends = python-installer
-	source = https://files.pythonhosted.org/packages/source/g/ginga/ginga-3.3.0.tar.gz
-	md5sums = 29c9a317e59a72ab1a4141fa385d31c0
+	source = https://files.pythonhosted.org/packages/source/g/ginga/ginga-3.4.0.tar.gz
+	md5sums = a81f1923b14d482689ca2e4b86e04427
 
 pkgname = python-ginga
 	depends = python-astropy>=3.2
-	depends = python-qtpy>=1.1
-	optdepends = python-scipy>=0.18.1
-	optdepends = python-pillow>=3.2.0
-	optdepends = python-matplotlib>=2.1
-	optdepends = python-opencv>=4.5.4.58
-	optdepends = python-piexif>=1.0.13
+	depends = python-qtpy>=2.0.1
+	depends = python-pillow>=3.2.0
+	depends = python-importlib-metadata
+	optdepends = python-scipy>=0.18.1: required by Pick, some built-in auto cuts algorithms used when you load an image
+	optdepends = python-matplotlib>=2.1: required by Pick, Cuts, Histogram, LineProfile
+	optdepends = python-opencv>=4.5.4.58: recommended
+	optdepends = python-exifread>=2.3.2: recommended
 	optdepends = python-beautifulsoup4>=4.3.2
-	optdepends = python-astroquery>=0.3.5
+	optdepends = python-astroquery>=0.3.5: required by Catalogs
 	optdepends = python-docutils: to display help for plugins
 	optdepends = python-photutils
 	optdepends = python-fitsio: for opening FITS files
 	optdepends = python-astlib: for WCS resolution
+	optdepends = python-cairo: for gtk3 backend
+	optdepends = python-gobject: for gtk3 backend
+	optdepends = python-pyqt5: for qt5 backend
+	optdepends = python-aggdraw: for tk backend
+	optdepends = python-tornado: for web backend
 	optdepends = python-ginga-doc: Documentation for Python-ASDF
-	optdepends = python-pytest-astropy: For testing
diff --git a/PKGBUILD b/PKGBUILD
index 05c4ad37e203..51947993bce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,16 +3,30 @@
 
 pkgname=python-ginga
 _pyname=${pkgname#python-}
-pkgver=3.3.0
+pkgver=3.4.0
 pkgrel=1
 pkgdesc="A viewer for astronomical data FITS (Flexible Image Transport System) files."
 arch=('any')
 url="https://ejeschke.github.io/ginga"
 license=('BSD')
-makedepends=('python-setuptools-scm' 'python-wheel' 'python-build' 'python-installer')
-checkdepends=('python-pytest-astropy-header' 'python-astropy')
+makedepends=('python-setuptools-scm'
+             'python-wheel'
+             'python-build'
+             'python-installer')
+checkdepends=('python-pytest-astropy-header'
+              'python-photutils'
+              'python-pillow'
+              'python-scipy'
+              'python-astlib')
 source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
-md5sums=('29c9a317e59a72ab1a4141fa385d31c0')
+md5sums=('a81f1923b14d482689ca2e4b86e04427')
+
+prepare() {
+    cd ${srcdir}/${_pyname}-${pkgver}
+
+    sed -i "/ignore:distutils/a \   ignore:the imp module is deprecated:DeprecationWarning" setup.cfg
+    sed -i "/Exec/a Icon=ginga" ginga.desktop
+}
 
 build() {
     cd ${srcdir}/${_pyname}-${pkgver}
@@ -23,26 +37,36 @@ build() {
 check() {
     cd ${srcdir}/${_pyname}-${pkgver}
 
-    pytest
+    pytest || warning "Tests failed"
 }
 
-package(){
-    depends=('python-astropy>=3.2' 'python-qtpy>=1.1')
-    optdepends=('python-scipy>=0.18.1'
-                'python-pillow>=3.2.0'
-                'python-matplotlib>=2.1'
-                'python-opencv>=4.5.4.58'
-                'python-piexif>=1.0.13'
+package() {
+    depends=('python-astropy>=3.2'
+             'python-qtpy>=2.0.1'
+             'python-pillow>=3.2.0'
+             'python-importlib-metadata')
+    optdepends=('python-scipy>=0.18.1: required by Pick, some built-in auto cuts algorithms used when you load an image'
+                'python-matplotlib>=2.1: required by Pick, Cuts, Histogram, LineProfile'
+                'python-opencv>=4.5.4.58: recommended'
+                'python-exifread>=2.3.2: recommended'
                 'python-beautifulsoup4>=4.3.2'
-                'python-astroquery>=0.3.5'
+                'python-astroquery>=0.3.5: required by Catalogs'
                 'python-docutils: to display help for plugins'
                 'python-photutils'
                 'python-fitsio: for opening FITS files'
                 'python-astlib: for WCS resolution'
-                'python-ginga-doc: Documentation for Python-ASDF'
-                'python-pytest-astropy: For testing')
+                'python-cairo: for gtk3 backend'
+                'python-gobject: for gtk3 backend'
+                'python-pyqt5: for qt5 backend'
+                'python-aggdraw: for tk backend'
+                'python-tornado: for web backend'
+                'python-ginga-doc: Documentation for Python-ASDF')
     cd ${srcdir}/${_pyname}-${pkgver}
 
+    install -D -m644 -t "${pkgdir}/usr/share/applications/${pkgname}" ${_pyname}.desktop
+    install -d -m644 "${pkgdir}/usr/share/icons/hicolor/512x512/apps"
+    install -m644 ${_pyname}/icons/${_pyname}-512x512.png \
+        "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pyname}.png"
     install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.txt
     install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README.md
     python -m installer --destdir="${pkgdir}" dist/*.whl