diff options
| -rw-r--r-- | .SRCINFO | 46 | ||||
| -rw-r--r-- | .gitignore | 8 | ||||
| -rw-r--r-- | PKGBUILD | 108 | ||||
| -rw-r--r-- | fix_for_new_matplotlib.patch | 11 |
4 files changed, 91 insertions, 82 deletions
@@ -1,48 +1,30 @@ -# Generated by mksrcinfo v8 -# Thu Feb 21 07:52:41 UTC 2019 pkgbase = python-pyspeckit pkgdesc = Toolkit for fitting and manipulating spectroscopic data in python - pkgver = 0.1.21 + pkgver = 1.0.3 pkgrel = 1 - url = https://pyspeckit.readthedocs.io/ - arch = i686 - arch = x86_64 + url = https://pyspeckit.readthedocs.io + arch = any + license = MIT license = BSD - checkdepends = tk - 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 = correct_doc_examples.patch - md5sums = e276915c2865e0e64dc132a3b9cb0b23 - md5sums = b1ea9f4f4d2c467c26c34293bfbd387f + makedepends = python-astropy + source = https://files.pythonhosted.org/packages/source/p/pyspeckit/pyspeckit-1.0.3.tar.gz + md5sums = 6d6930970e5555f8a5499d78571ec734 pkgname = python-pyspeckit - depends = python-numpy>=1.4 - depends = python-astropy>=1.0 - depends = python-matplotlib>=1.4 + depends = python-astropy + depends = python-casa-formats-io + depends = python-dask + depends = python-joblib + depends = python-radio_beam>=0.3.3 + depends = python-six optdepends = hdf5 optdepends = python-atpy + optdepends = python-scipy optdepends = python-spectral-cube 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 000000000000..e896dcd6056d --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +src +pkg +*.src.tar.gz +*.tar.gz +*.tar.bz2 +*.part +*.pkg.tar.* +*.log @@ -1,87 +1,95 @@ # 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 +_test_commit="c11ed9b3747a7b5bc18a48340ca3c2f207cd8c85" +pkgname=("python-${_pyname}" "python-${_pyname}-doc") +pkgver=1.0.3 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') -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') -md5sums=('e276915c2865e0e64dc132a3b9cb0b23' - 'b1ea9f4f4d2c467c26c34293bfbd387f') +arch=('any') +url="https://pyspeckit.readthedocs.io" +license=('MIT' 'BSD') +makedepends=('python-setuptools' + 'python-sphinx-astropy' + 'python-astropy') +# 'python-sphinx-astropy') +#checkdepends=('python-pytest' +## 'tk' +# 'python-spectral-cube' +# 'python-scipy' +# 'python-sphinx' +# 'python-matplotlib' +## 'python-six') +source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz") +# "https://github.com/pyspeckit/pyspeckit-tests/raw/master/HI145947.9+152515_1500+15d.src") +md5sums=('6d6930970e5555f8a5499d78571ec734') + +get_pyinfo() { + [[ $1 == "site" ]] && python -c "import site; print(site.getsitepackages()[0])" || \ + python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))" +} 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} + sed -i -e "/^version =/c version = '${pkgver}'" -e "/^release =/c release = '${pkgver}'" docs/conf.py + sed -i "/cp -R _build/d" docs/Makefile + sed -i -e 's|getargspec|getfullargspec|g' -e 's|formatargspec|signature|g' docs/sphinxext/docscrape.py +# ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/*.fits,} +# ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/*.txt,} +# ln -rs ${srcdir}/${_pyname}-${pkgver}/{${_pyname}/tests/wav2rgb.py,} +# ln -rs ${srcdir}/HI145947*src . +# sed -e "/import\ idlsave/c from scipy.io import readsav as idlsave" \ +# -e "s|\.read||g" -i ${_pyname}/spectrum/readers/alfalfa.py +# sed -i "s/\.value//g" examples/agn_example.py } build() { - msg "Building Python2" - cd ${srcdir}/${_pyname}-${pkgver}-py2 - python2 setup.py build --use-system-libraries --offline - - msg "Building Python3" cd ${srcdir}/${_pyname}-${pkgver} - python setup.py build --use-system-libraries --offline + python setup.py build msg "Building Docs" - python setup.py build_docs -} - -check() { -# msg "Checking Python3" - cd ${srcdir}/${_pyname}-${pkgver} - python setup.py test - -# msg "Checking Python2" -# cd ${srcdir}/${_pyname}-${pkgver}-py2 -# python2 setup.py test + PYTHONPATH="../build/lib" make -C docs html } -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 -} +#check() { +# cd ${srcdir}/${_pyname}-${pkgver} +# +# PYTHONPATH="build/lib" pytest -vv -l -ra --color=yes -o console_output_style=count \ +# --ignore=examples/cube_from_scratch_example.py \ +# --ignore=examples/gbt_sdfits_example.py \ +# --ignore=examples/h2co_mm_example.py \ +# --ignore=examples/sn_example.py \ +# --ignore=pyspeckit/tests/alfalfa_example.py \ +# --ignore=pyspeckit/tests/jane_example.py \ +# --ignore=pyspeckit/tests/simple_fit_example.py +# #|| warning "Tests failed" -vv -l -ra --color=yes -o console_output_style=count +# +#} package_python-pyspeckit() { - depends=('python-numpy>=1.4' 'python-astropy>=1.0' 'python-matplotlib>=1.4') + depends=('python-astropy' 'python-casa-formats-io' 'python-dask' 'python-joblib' 'python-radio_beam>=0.3.3' 'python-six') optdepends=('hdf5' 'python-atpy' + 'python-scipy' 'python-spectral-cube' 'python-lmfit' 'python-pyspeckit-doc: Documentation for PySpecKit') cd ${srcdir}/${_pyname}-${pkgver} install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" licenses/* + install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE install -D -m644 -t "${pkgdir}/usr/share/doc/${pkgname}" README* - python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline + python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 + rm -r ${pkgdir}/$(get_pyinfo site)/examples } package_python-pyspeckit-doc() { pkgdesc="Documentation for Python PySpecKit module" cd ${srcdir}/${_pyname}-${pkgver}/docs/_build + install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../licenses/* + install -D -m644 -t "${pkgdir}/usr/share/licenses/${pkgname}" ../../LICENSE install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}" cp -a html "${pkgdir}/usr/share/doc/${pkgbase}" } diff --git a/fix_for_new_matplotlib.patch b/fix_for_new_matplotlib.patch new file mode 100644 index 000000000000..f9e7f2f359b2 --- /dev/null +++ b/fix_for_new_matplotlib.patch @@ -0,0 +1,11 @@ +--- 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 @@ + handletextpad=handletextpad, labelspacing=labelspacing, + frameon=frameon, fontsize=fontsize, **kwargs) + self.Spectrum.plotter.axis.add_artist(self.fitleg) +- self.fitleg.draggable(True) ++ self.fitleg.set_draggable(True) + if self.Spectrum.plotter.autorefresh: + self.Spectrum.plotter.refresh() + |