python-lmfit: 1.0.0-1 -> 1.0.0-2

4 files changed, 6 insertions, 129 deletions

diff --git a/python-lmfit/PKGBUILD b/python-lmfit/PKGBUILD
index a5e584b2..e98b5bad 100644
--- a/python-lmfit/PKGBUILD
+++ b/python-lmfit/PKGBUILD
@@ -1,83 +1,39 @@
 # Contributor: Francois Boulogne <fboulogne at april dot org>
 # Maintainer: Erich Eckner <arch at eckner dot net>
 
-pkgbase=python-lmfit
+pkgname='python-lmfit'
 _pkgname=lmfit-py
-pkgname=('python-lmfit' 'python2-lmfit')
 pkgver=1.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Least-Squares Minimization with Constraints for Python"
 arch=('any')
 url="http://lmfit.github.io/lmfit-py/"
 license=('BSD')
-_deppy2=(
-  'python2>=2.7'
-  'python2<2.8'
-)
-_deppy=(
+depends=(
   'python>=3.8'
   'python<3.9'
-)
-_depends=(
   'python-asteval>=0.9.16'
   'python-numpy>=1.16'
   'python-scipy>=1.2'
   'python-uncertainties>=3.0.1')
-_makedepends=(
-  'python-setuptools')
-_checkdepends=(
-  'python-nose')
 makedepends=(
-  "${_deppy[@]}"
-  "${_deppy2[@]}"
-  "${_depends[@]}"
-  "${_depends[@]/python/python2}"
-  "${_makedepends[@]}"
-  "${_makedepends[@]/python/python2}"
-)
+  'python-setuptools')
 checkdepends=(
-  "${_checkdepends[@]}"
-  "${_checkdepends[@]/python/python2}"
-)
+  'python-nose')
 source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/lmfit/lmfit-py/archive/${pkgver}.tar.gz")
 sha512sums=('48c8785c23b8f398e8d01876d917ee3fefe9a429fc6f5238caa7fd0ccea5f0bf35f685572695e53f31389926fb4e44df2701d3423f4f867c6351177c8ce327a0')
 
-prepare() {
-  cp -a "lmfit-py-${pkgver}" "lmfit-py2-${pkgver}"
-}
-
 build() {
   cd "$srcdir/lmfit-py-$pkgver"
   python setup.py build
-  
-  cd "$srcdir/lmfit-py2-$pkgver"
-  python2 setup.py build
 }
 
 check() {
   cd "$srcdir/lmfit-py-$pkgver"
   nosetests3 tests || echo 'WARNING: python3 tests failed'
-
-  cd "$srcdir/lmfit-py2-$pkgver"
-  nosetests2 tests || echo 'WARNING: python2 tests failed'
 }
 
-package_python-lmfit(){
-  depends=(
-    "${_deppy[@]}"
-    "${_depends[@]}"
-  )
+package(){
   cd "$srcdir/lmfit-py-$pkgver"
   python setup.py install --root="$pkgdir/" --optimize=1
 }
-
-package_python2-lmfit(){
-  depends=(
-    "${_deppy2[@]}"
-    "${_depends[@]/python/python2}"
-  )
-  cd "$srcdir/lmfit-py2-$pkgver"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-}
-
-# vim:ts=2:sw=2:et:
diff --git a/python2-pyopencl/.gitignore b/python2-pyopencl/.gitignore
deleted file mode 100644
index d487aebd..00000000
--- a/python2-pyopencl/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pyopencl
diff --git a/python2-pyopencl/LICENSE.txt b/python2-pyopencl/LICENSE.txt
deleted file mode 100644
index 3ce400f9..00000000
--- a/python2-pyopencl/LICENSE.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
diff --git a/python2-pyopencl/PKGBUILD b/python2-pyopencl/PKGBUILD
deleted file mode 100644
index 4b20efbc..00000000
--- a/python2-pyopencl/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Erich Eckner <arch at eckner dot net>
-# Contributor: Santiago Torres-Arias <santiago@archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-
-_pypiname=pyopencl
-pkgname=python2-pyopencl
-pkgver=2019.1.2
-pkgrel=2
-epoch=1
-pkgdesc="A complete, object-oriented language binding of OpenCL to Python2"
-arch=('i686' 'pentium4' 'x86_64')
-url="https://mathema.tician.de/software/pyopencl"
-license=('MIT' 'Apache' 'BSD')
-depends=(
-  'boost-libs'
-  'mesa'
-  'opencl-headers'
-  'opencl-icd-loader'
-  'pyopencl-headers'
-  'python2>=2.7'
-  'python2<2.8'
-  'python2-cffi'
-  'python2-mako'
-  'python2-numpy'
-  'python2-pybind11'
-  'python2-pytools'
-  'python2-setuptools'
-)
-makedepends=('ctags' 'boost' 'git')
-checkdepends=('python2-six' 'python2-appdirs'
-            'python2-pytest' 'python2-pytools')
-source=("git+https://github.com/inducer/pyopencl.git?signed#tag=v${pkgver}")
-validpgpkeys=("900A958D9A0ACA58B1468F2471AA298BCA171145") # Andreas Ratchke
-sha512sums=('SKIP')
-
-build() {
-    cd "pyopencl"
-    git submodule init && git submodule update
-    python2 ./configure.py --python-exe=python2 --cl-pretend-version=1.2 # --boost-python-libname=boost_python3
-    make
-}
-
-check(){
-    # INFO: to avoid a PLATFORM_NOT_FOUND_KHR error here, you would have to install
-    # the driver of your specific video card in here
-    # checkdepends+=('amdgpu')
-    cd pyopencl
-    PYTHONPATH="$PWD/build/lib.linux-${CARCH}-2.7/" make tests
-}
-
-package() {
-    cd pyopencl
-    python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-
-    rm -fr "${pkgdir}"/usr/include
-
-    install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}