summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorUniversebenzene2020-03-04 13:46:25 +0800
committerUniversebenzene2020-03-04 13:46:25 +0800
commit0ecd6ed66bde9bb6c07b029763d37ae92f1efe4e (patch)
tree94561150f56b900672a13087700fe5b73fb238cd
parent1ef34b5ad9bcdef2a72cb45193f2607c5bd0ccc1 (diff)
downloadaur-0ecd6ed66bde9bb6c07b029763d37ae92f1efe4e.tar.gz
Update to version 0.1.23
-rw-r--r--.SRCINFO23
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD68
-rw-r--r--fix_for_new_matplotlib.patch1
4 files changed, 50 insertions, 50 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 35bbde0571b..4400dc120c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = python-pyspeckit
pkgdesc = Toolkit for fitting and manipulating spectroscopic data in python
- pkgver = 0.1.21
- pkgrel = 2
+ pkgver = 0.1.23
+ pkgrel = 1
url = https://pyspeckit.readthedocs.io/
arch = i686
arch = x86_64
@@ -10,17 +10,15 @@ pkgbase = python-pyspeckit
checkdepends = python-pytest-astropy
checkdepends = python-spectral-cube
makedepends = python-setuptools
- makedepends = python2-setuptools
makedepends = python-astropy
makedepends = python-astropy-helpers>=3.1
- makedepends = python2-astropy-helpers
makedepends = python-sphinx-astropy
- source = https://files.pythonhosted.org/packages/source/p/pyspeckit/pyspeckit-0.1.21.tar.gz
+ source = https://files.pythonhosted.org/packages/source/p/pyspeckit/pyspeckit-0.1.23.tar.gz
source = correct_doc_examples.patch
source = fix_for_new_matplotlib.patch
- md5sums = e276915c2865e0e64dc132a3b9cb0b23
+ md5sums = 969c6d575e7f8a7a9d78921b4f977a43
md5sums = b1ea9f4f4d2c467c26c34293bfbd387f
- md5sums = e1fb3919d6d3ae5e34fbbdcf95d5aae6
+ md5sums = a9a13077c3a3b3d039266450d9318aae
pkgname = python-pyspeckit
depends = python-numpy>=1.4
@@ -32,17 +30,6 @@ pkgname = python-pyspeckit
optdepends = python-lmfit
optdepends = python-pyspeckit-doc: Documentation for PySpecKit
-pkgname = python2-pyspeckit
- depends = python2-numpy>=1.4
- depends = python2-astropy>=1.0
- depends = python2-matplotlib>=1.4
- optdepends = hdf5
- optdepends = python2-atpy
- optdepends = python2-spectral-cube
- optdepends = python2-lmfit
- optdepends = python-pyspeckit-doc: Documentation for PySpecKit
- optdepends = python2-pytest: For testing
-
pkgname = python-pyspeckit-doc
pkgdesc = Documentation for Python PySpecKit module
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..e896dcd6056
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+src
+pkg
+*.src.tar.gz
+*.tar.gz
+*.tar.bz2
+*.part
+*.pkg.tar.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 0f060c17cf5..9bf625f472b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,43 @@
# Maintainer: Astro Benzene <universebenzene at sina dot com>
pkgbase=python-pyspeckit
_pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.1.21
-pkgrel=2
+pkgname=("python-${_pyname}" "python-${_pyname}-doc")
+# "python2-${_pyname}"
+pkgver=0.1.23
+pkgrel=1
pkgdesc="Toolkit for fitting and manipulating spectroscopic data in python"
arch=('i686' 'x86_64')
url="https://pyspeckit.readthedocs.io/"
license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-astropy' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-sphinx-astropy')
+makedepends=('python-setuptools'
+# 'python2-setuptools'
+ 'python-astropy'
+ 'python-astropy-helpers>=3.1'
+# 'python2-astropy-helpers'
+ 'python-sphinx-astropy')
checkdepends=('tk' 'python-pytest-astropy' 'python-spectral-cube')
source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
'correct_doc_examples.patch'
'fix_for_new_matplotlib.patch')
-md5sums=('e276915c2865e0e64dc132a3b9cb0b23'
+md5sums=('969c6d575e7f8a7a9d78921b4f977a43'
'b1ea9f4f4d2c467c26c34293bfbd387f'
- 'e1fb3919d6d3ae5e34fbbdcf95d5aae6')
+ 'a9a13077c3a3b3d039266450d9318aae')
prepare() {
cd ${srcdir}/${_pyname}-${pkgver}
sed -i -e '/auto_use/s/True/False/' setup.cfg
- patch -Np1 -i "${srcdir}/correct_doc_examples.patch"
- cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
- patch -Np1 -i "${srcdir}/fix_for_new_matplotlib.patch"
+# patch -Np1 -i "${srcdir}/correct_doc_examples.patch"
+# cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+# patch -Np1 -i "${srcdir}/fix_for_new_matplotlib.patch"
}
build() {
- msg "Building Python2"
- cd ${srcdir}/${_pyname}-${pkgver}-py2
- python2 setup.py build --use-system-libraries --offline
+# msg "Building Python2"
+# cd ${srcdir}/${_pyname}-${pkgver}-py2
+# python2 setup.py build --use-system-libraries --offline
- msg "Building Python3"
+# msg "Building Python3"
cd ${srcdir}/${_pyname}-${pkgver}
python setup.py build --use-system-libraries --offline
@@ -42,30 +48,30 @@ build() {
check() {
# msg "Checking Python3"
cd ${srcdir}/${_pyname}-${pkgver}
- python setup.py test
+# python setup.py test
# msg "Checking Python2"
# cd ${srcdir}/${_pyname}-${pkgver}-py2
# python2 setup.py test
}
-package_python2-pyspeckit() {
- depends=('python2-numpy>=1.4' 'python2-astropy>=1.0' 'python2-matplotlib>=1.4')
- optdepends=('hdf5'
- 'python2-atpy'
- 'python2-spectral-cube'
- 'python2-lmfit'
- 'python-pyspeckit-doc: Documentation for PySpecKit'
- 'python2-pytest: For testing')
- cd ${srcdir}/${_pyname}-${pkgver}-py2
-
- install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
- install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*
- python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
- sed -i -e '/\#\/bin/s/ipython/ipython2/' ${pkgdir}/usr/bin/pyspeckit_script.py
- mv ${pkgdir}/usr/bin/astropy-package-template-example{,2}
- mv ${pkgdir}/usr/bin/pyspeckit_script{,2}.py
-}
+#package_python2-pyspeckit() {
+# depends=('python2-numpy>=1.4' 'python2-astropy>=1.0' 'python2-matplotlib>=1.4')
+# optdepends=('hdf5'
+# 'python2-atpy'
+# 'python2-spectral-cube'
+# 'python2-lmfit'
+# 'python-pyspeckit-doc: Documentation for PySpecKit'
+# 'python2-pytest: For testing')
+# cd ${srcdir}/${_pyname}-${pkgver}-py2
+#
+# install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/*
+# install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README*
+# python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+# sed -i -e '/\#\/bin/s/ipython/ipython2/' ${pkgdir}/usr/bin/pyspeckit_script.py
+# mv ${pkgdir}/usr/bin/astropy-package-template-example{,2}
+# mv ${pkgdir}/usr/bin/pyspeckit_script{,2}.py
+#}
package_python-pyspeckit() {
depends=('python-numpy>=1.4' 'python-astropy>=1.0' 'python-matplotlib>=1.4')
diff --git a/fix_for_new_matplotlib.patch b/fix_for_new_matplotlib.patch
index e9221f4eda7..f9e7f2f359b 100644
--- a/fix_for_new_matplotlib.patch
+++ b/fix_for_new_matplotlib.patch
@@ -1,4 +1,3 @@
-diff -ura a/pyspeckit/spectrum/fitters.py b/pyspeckit/spectrum/fitters.py
--- a/pyspeckit/spectrum/fitters.py 2018-07-12 23:37:07.000000000 +0800
+++ b/pyspeckit/spectrum/fitters.py 2019-06-09 14:36:20.587282658 +0800
@@ -1367,7 +1367,7 @@