Adopt and update

3 files changed, 54 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d87a940ec64a..54b04ae9f0a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,46 +1,29 @@
 pkgbase = python-lmfit-git
-	pkgdesc = Non-Linear Least Squares Minimization, with flexible Parameter settings, based on scipy.optimize.leastsq, and with many additional classes and methods for curve fitting
-	pkgver = 0.9.12.r73.24eecd1
+	pkgdesc = Non-Linear Least-Squares Minimization and Curve-Fitting for Python
+	pkgver = 1.2.1.r3.g502cc9ba
 	pkgrel = 1
-	url = https://github.com/lmfit/lmfit-py.git
-	arch = i686
-	arch = x86_64
+	url = https://lmfit.github.io/lmfit-py
+	arch = any
 	license = BSD
-	checkdepends = python-nose
-	checkdepends = python2-nose
-	checkdepends = python-pytest
-	checkdepends = python-matplotlib
-	checkdepends = python2-matplotlib
-	checkdepends = ipython
-	checkdepends = ipython2
-	checkdepends = python-ipywidgets
-	checkdepends = python2-ipywidgets
-	checkdepends = python-pandas
-	checkdepends = python2-pandas
-	checkdepends = python-future
-	checkdepends = python2-future
 	makedepends = git
-	makedepends = python-numpy
-	makedepends = python2-numpy
-	makedepends = python-scipy
-	makedepends = python2-scipy
-	makedepends = python-asteval-git
-	makedepends = python2-asteval-git
-	makedepends = python-uncertainties
-	makedepends = python2-uncertainties
-	optdepends = python2-pytest
-	source = python-lmfit::git+https://github.com/lmfit/lmfit-py.git
-	md5sums = SKIP
-
-pkgname = python-lmfit-git
+	makedepends = python-build
+	makedepends = python-installer
+	makedepends = python-wheel
+	makedepends = python-setuptools-scm
+	depends = python-asteval
 	depends = python-numpy
 	depends = python-scipy
-	depends = python-asteval-git
-	depends = python2-uncertainties
-
-pkgname = python2-lmfit-git
-	depends = python2-numpy
-	depends = python2-scipy
-	depends = python2-asteval-git
-	depends = python2-uncertainties
+	depends = python-uncertainties
+	optdepends = python-corner
+	optdepends = python-emcee
+	optdepends = python-pandas
+	optdepends = python-jupyter
+	optdepends = python-matplotlib
+	optdepends = python-dill
+	optdepends = python-numdifftools
+	provides = python-lmfit
+	conflicts = python-lmfit
+	source = git+https://github.com/lmfit/lmfit-py
+	md5sums = SKIP
 
+pkgname = python-lmfit-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..4df5cbd2d036
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.SRCINFO
+!.gitignore
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index db6133aacaf3..343ceaec1324 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,39 @@
-# Maintainer: Andres Alejandro Navarro Alsina <aanavarroa@unal.edu.co>
-# Contributor: newville
-_pkgname=python-lmfit
-pkgbase=python-lmfit-git
-pkgname=('python-lmfit-git' 'python2-lmfit-git')
-pkgver=0.9.12.r73.24eecd1
+# Maintainer: a821
+
+pkgname=python-lmfit-git
+pkgver=1.2.1.r3.g502cc9ba
 pkgrel=1
-pkgdesc="Non-Linear Least Squares Minimization, with flexible Parameter settings, based on scipy.optimize.leastsq, and with many additional classes and methods for curve fitting  "
-arch=('i686' 'x86_64')
-url="https://github.com/lmfit/lmfit-py.git"
+pkgdesc="Non-Linear Least-Squares Minimization and Curve-Fitting for Python"
+arch=('any')
+url="https://lmfit.github.io/lmfit-py"
 license=('BSD')
-makedepends=('git' 'python-numpy' 'python2-numpy' 'python-scipy' 'python2-scipy' 'python-asteval-git' 'python2-asteval-git' 'python-uncertainties' 'python2-uncertainties')
-optdepends=('python2-pytest')
-checkdepends=('python-nose' 'python2-nose' 'python-pytest' 'python-matplotlib' 'python2-matplotlib' 'ipython' 'ipython2' 'python-ipywidgets' 'python2-ipywidgets' 'python-pandas' 'python2-pandas' 'python-future' 'python2-future' )
-source=("${_pkgname}::git+${url}")
+depends=('python-asteval' 'python-numpy' 'python-scipy' 'python-uncertainties')
+makedepends=('git' 'python-build' 'python-installer' 'python-wheel' 'python-setuptools-scm')
+optdepends=(
+    'python-corner'
+    'python-emcee'
+    'python-pandas'
+    'python-jupyter'
+    'python-matplotlib'
+    'python-dill'
+    'python-numdifftools'
+)
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/lmfit/lmfit-py')
 md5sums=('SKIP')
 
 pkgver() {
-	 cd $_pkgname
-	 printf "%s" "$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
-}
-
-prepare() {
-	  cp -a $_pkgname{,-py2}
+    git -C lmfit-py describe --long --tags | sed 's/-/.r/;s/-/./g'
 }
 
 build() {
-	cd "$srcdir"/$_pkgname
-	python setup.py build
-
-	cd "$srcdir"/$_pkgname-py2
-	python2 setup.py build
+    cd lmfit-py
+    python -m build --wheel --no-isolation
 }
 
-check() {
-	cd "$srcdir"/$_pkgname
-	#python setup.py test || warning 'Tests failed'
-	nosetests -v || warning 'Tests failed'
-	
-	cd "$srcdir"/$_pkgname-py2
-	#python2 setup.py test || warning 'Tests failed'
-	nosetests2 -v || warning 'Tests2 failed'
+package() {
+    cd lmfit-py
+    python -m installer --destdir="$pkgdir" dist/*.whl
+    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-
-package_python-lmfit-git() {
-			      depends=('python-numpy' 'python-scipy' 'python-asteval-git' 'python2-uncertainties')
-	  		      cd "${_pkgname}"
-	  		      python setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-	  		      install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
-package_python2-lmfit-git() {
-			       depends=('python2-numpy' 'python2-scipy' 'python2-asteval-git' python2-uncertainties)
-			       cd "${_pkgname}"
-	  		       python2 setup.py install --root=${pkgdir} --prefix=/usr --optimize=1
-	  		       install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
\ No newline at end of file