summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO47
-rw-r--r--.gitignore8
-rw-r--r--PKGBUILD79
-rw-r--r--python2-radio_beam.install5
4 files changed, 61 insertions, 78 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d405a8a7b63c..1ae8fb28bc62 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,32 @@
pkgbase = python-radio_beam
- pkgdesc = A tool for manipulating and utilizing two dimensional gaussian beams within the astropy framework
- pkgver = 0.3.1
+ pkgdesc = Operations for radio astronomy beams with astropy
+ pkgver = 0.3.7
pkgrel = 1
- url = https://radio-beam.readthedocs.io/
- arch = i686
- arch = x86_64
+ url = https://radio-beam.readthedocs.io
+ arch = any
license = BSD
- checkdepends = python-pytest-astropy
- checkdepends = python-astropy-helpers<3.2
- checkdepends = python2-pytest<3.7
- checkdepends = python2-astropy
- makedepends = python-setuptools
- makedepends = python2-setuptools
- makedepends = python-astropy
- makedepends = python-astropy-helpers>=3.1
- makedepends = python2-astropy-helpers
+ checkdepends = python-pytest-astropy-header
+ checkdepends = python-pytest-doctestplus
+ checkdepends = python-matplotlib
+ checkdepends = python-scipy
+ checkdepends = python-six
+ makedepends = python-setuptools-scm
+ makedepends = python-wheel
+ makedepends = python-build
+ makedepends = python-installer
makedepends = python-sphinx-astropy
- source = https://files.pythonhosted.org/packages/source/r/radio_beam/radio_beam-0.3.1.tar.gz
- source = python2-radio_beam.install
- md5sums = 268a38a8196a824bb69c815cdd35fe3a
- md5sums = a5d326a896bc49ec788cd48f340c1863
+ makedepends = python-astropy
+ source = https://files.pythonhosted.org/packages/source/r/radio-beam/radio-beam-0.3.7.tar.gz
+ md5sums = 673cf7295798add8fa95cd86cd3364ee
pkgname = python-radio_beam
- depends = python
depends = python-astropy
+ depends = python-six
+ depends = python-scipy
optdepends = python-pytest-astropy: For testing
- optdepends = python-radio_beam-doc: Documentation for Radio Beam
-
-pkgname = python2-radio_beam
- install = python2-radio_beam.install
- depends = python2
- depends = python2-astropy
- optdepends = python2-pytest32: For testing
+ optdepends = python-matplotlib: all functions
+ optdepends = python-scipy: all functions
optdepends = python-radio_beam-doc: Documentation for Radio Beam
pkgname = python-radio_beam-doc
pkgdesc = Documentation for Python Radio Beam 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
diff --git a/PKGBUILD b/PKGBUILD
index e16101c09d16..d8323dd05909 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,79 +1,66 @@
# Maintainer: Astro Benzene <universebenzene at sina dot com>
pkgbase=python-radio_beam
-_pyname=${pkgbase#python-}
-pkgname=("python-${_pyname}" "python2-${_pyname}" "python-${_pyname}-doc")
-pkgver=0.3.1
+_pname=${pkgbase#python-}
+_pyname=${_pname/_/-}
+pkgname=("python-${_pname}" "python-${_pname}-doc")
+pkgver=0.3.7
pkgrel=1
-pkgdesc="A tool for manipulating and utilizing two dimensional gaussian beams within the astropy framework"
-arch=('i686' 'x86_64')
-url="https://radio-beam.readthedocs.io/"
+pkgdesc="Operations for radio astronomy beams with astropy"
+arch=('any')
+url="https://radio-beam.readthedocs.io"
license=('BSD')
-makedepends=('python-setuptools' 'python2-setuptools' 'python-astropy' 'python-astropy-helpers>=3.1' 'python2-astropy-helpers' 'python-sphinx-astropy')
-checkdepends=('python-pytest-astropy' 'python-astropy-helpers<3.2' 'python2-pytest<3.7' 'python2-astropy')
-source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz"
- "python2-${_pyname}.install")
-md5sums=('268a38a8196a824bb69c815cdd35fe3a'
- 'a5d326a896bc49ec788cd48f340c1863')
+makedepends=('python-setuptools-scm'
+ 'python-wheel'
+ 'python-build'
+ 'python-installer'
+ 'python-sphinx-astropy'
+ 'python-astropy')
+checkdepends=('python-pytest-astropy-header'
+ 'python-pytest-doctestplus'
+ 'python-matplotlib'
+ 'python-scipy'
+ 'python-six') # astropy already in makedepends
+source=("https://files.pythonhosted.org/packages/source/${_pyname:0:1}/${_pyname}/${_pyname}-${pkgver}.tar.gz")
+md5sums=('673cf7295798add8fa95cd86cd3364ee')
-prepare() {
- cd ${srcdir}/${_pyname}-${pkgver}
- sed -i -e '/auto_use/s/True/False/' setup.cfg
-
- cp -a ${srcdir}/${_pyname}-${pkgver}{,-py2}
+get_pyver() {
+ python -c "import sys; print('$1'.join(map(str, sys.version_info[:2])))"
}
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 -m build --wheel --no-isolation
msg "Building Docs"
- python setup.py build_docs
+ ln -rs ${srcdir}/${_pyname}-${pkgver}/${_pyname/-/_}*egg-info \
+ build/lib/${_pyname/-/_}-${pkgver}-py$(get_pyver .).egg-info
+ PYTHONPATH="../build/lib" make -C docs html
}
check() {
- msg "Checking Python3"
- cd ${srcdir}/${_pyname}-${pkgver}
- python setup.py test
-
- if [ -z $(pacman -Qsq python2-pytest-cov) ]; then
- msg "Checking Python2"
- cd ${srcdir}/${_pyname}-${pkgver}-py2
- python2 setup.py test
- fi
-}
-
-package_python2-radio_beam() {
- depends=('python2' 'python2-astropy')
- optdepends=('python2-pytest32: For testing'
- 'python-radio_beam-doc: Documentation for Radio Beam')
- install=python2-${_pyname}.install
- cd ${srcdir}/${_pyname}-${pkgver}-py2
+ cd ${srcdir}/${_pyname}-${pkgver}
- install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
- install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
- python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+ pytest --ignore=docs/_build || warning "Tests failed" # -vv -l -ra --color=yes -o console_output_style=count
}
package_python-radio_beam() {
- depends=('python' 'python-astropy')
+ depends=('python-astropy' 'python-six' 'python-scipy')
optdepends=('python-pytest-astropy: For testing'
+ 'python-matplotlib: all functions'
+ 'python-scipy: all functions'
'python-radio_beam-doc: Documentation for Radio Beam')
cd ${srcdir}/${_pyname}-${pkgver}
install -D -m644 LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -D -m644 README.md -t "${pkgdir}/usr/share/doc/${pkgname}"
- python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1 --use-system-libraries --offline
+ python -m installer --destdir="${pkgdir}" dist/*.whl
}
package_python-radio_beam-doc() {
pkgdesc="Documentation for Python Radio Beam module"
cd ${srcdir}/${_pyname}-${pkgver}/docs/_build
+ install -D -m644 ../../LICENSE.rst -t "${pkgdir}/usr/share/licenses/${pkgname}"
install -d -m755 "${pkgdir}/usr/share/doc/${pkgbase}"
cp -a html "${pkgdir}/usr/share/doc/${pkgbase}"
}
diff --git a/python2-radio_beam.install b/python2-radio_beam.install
deleted file mode 100644
index 8544a6f6091a..000000000000
--- a/python2-radio_beam.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
- echo "
- ==> If you want to run the testing for python2 version of radio_beam, you need to remove the python2-pytest-cov package first.
- "
-}