From 4e2a5b9f54633b0e976efcfc2c8614b3db80151a Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Fri, 13 Jan 2023 12:08:17 +0000 Subject: [PATCH 1/5] fix checksum --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9ef9d63..d26af8d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -21,6 +21,6 @@ pkgbase = python-plotly optdepends = python-scipy options = !strip source = python-plotly-5.12.0.tar.gz::https://github.com/plotly/plotly.py/archive/v5.12.0.tar.gz - sha256sums = bb0145d46b8fc94d341222e0435c93e0f371bf56ea82d2a5d22e951fd726e379 + sha256sums = 33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4 pkgname = python-plotly diff --git a/PKGBUILD b/PKGBUILD index 8cc56dc..0b7de77 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -26,7 +26,7 @@ license=('MIT') arch=('any') source=("${pkgname}-${pkgver}.tar.gz::https://github.com/plotly/plotly.py/archive/v${pkgver}.tar.gz") options=(!strip) # strip isn't useful for python files and takes forever -sha256sums=('bb0145d46b8fc94d341222e0435c93e0f371bf56ea82d2a5d22e951fd726e379') +sha256sums=('33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4') build() { cd plotly.py-${pkgver}/packages/python/plotly From 22623b44249b5158101e04bdd734113ac9e744b0 Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Fri, 13 Jan 2023 12:08:41 +0000 Subject: [PATCH 2/5] bump pkgrel --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d26af8d..b9edbfd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = python-plotly pkgdesc = An open-source, interactive graphing library pkgver = 5.12.0 - pkgrel = 1 + pkgrel = 2 url = https://github.com/plotly/plotly.py arch = any license = MIT diff --git a/PKGBUILD b/PKGBUILD index 0b7de77..7e23f74 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-plotly pkgver=5.12.0 -pkgrel=1 +pkgrel=2 pkgdesc="An open-source, interactive graphing library" url="https://github.com/plotly/plotly.py" depends=(python From 032a38db2f8cbe069f1953d30ec95491a375d3be Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Fri, 13 Jan 2023 13:35:21 +0000 Subject: [PATCH 3/5] fix architecture, add core tests, update optdeps --- .SRCINFO | 9 ++++++++- PKGBUILD | 45 ++++++++++++++++++++++++++++++++------------- 2 files changed, 40 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b9edbfd..b44f862 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -3,8 +3,10 @@ pkgbase = python-plotly pkgver = 5.12.0 pkgrel = 2 url = https://github.com/plotly/plotly.py - arch = any + arch = x86_64 license = MIT + checkdepends = python-requests + checkdepends = python-pytest makedepends = python-setuptools makedepends = python-jupyter_core makedepends = python-tornado @@ -19,6 +21,11 @@ pkgbase = python-plotly optdepends = python-matplotlib optdepends = python-pillow optdepends = python-scipy + optdepends = python-ipykernel + optdepends = python-pandas + optdepends = python-colorcet + optdepends = python-inflect + optdepends = python-psutil options = !strip source = python-plotly-5.12.0.tar.gz::https://github.com/plotly/plotly.py/archive/v5.12.0.tar.gz sha256sums = 33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4 diff --git a/PKGBUILD b/PKGBUILD index 7e23f74..b04fc30 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,25 +5,39 @@ pkgname=python-plotly pkgver=5.12.0 pkgrel=2 pkgdesc="An open-source, interactive graphing library" +arch=('x86_64') url="https://github.com/plotly/plotly.py" -depends=(python -python-tenacity) +license=('MIT') +depends=( +python +python-tenacity +) # optdepends based on optional_requirements.txt optdepends=( -'ipython' -'jupyterlab' -'python-ipywidgets' -'python-numpy' -'python-matplotlib' -'python-pillow' -'python-scipy') -makedepends=(python-setuptools +ipython +jupyterlab +python-ipywidgets +python-numpy +python-matplotlib +python-pillow +python-scipy +python-ipykernel +python-pandas +python-colorcet +python-inflect +python-psutil +) +makedepends=( +python-setuptools python-jupyter_core python-tornado jupyterlab -npm) -license=('MIT') -arch=('any') +npm +) +checkdepends=( +python-requests +python-pytest +) source=("${pkgname}-${pkgver}.tar.gz::https://github.com/plotly/plotly.py/archive/v${pkgver}.tar.gz") options=(!strip) # strip isn't useful for python files and takes forever sha256sums=('33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4') @@ -33,6 +47,11 @@ build() { NODE_OPTIONS=--openssl-legacy-provider python setup.py build } +check() { + cd plotly.py-${pkgver}/packages/python/plotly + pytest plotly/tests/test_core +} + package() { cd plotly.py-${pkgver}/packages/python/plotly python setup.py install --root="${pkgdir}" --optimize=1 --skip-build From b76f4c52af2c5bb2bf147411f64ead1d19d1273f Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Fri, 13 Jan 2023 18:24:19 +0000 Subject: [PATCH 4/5] build with SKIP_NPM=1 --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b44f862..382a96e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = python-plotly pkgdesc = An open-source, interactive graphing library pkgver = 5.12.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/plotly/plotly.py arch = x86_64 license = MIT diff --git a/PKGBUILD b/PKGBUILD index b04fc30..1daab4c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-plotly pkgver=5.12.0 -pkgrel=2 +pkgrel=3 pkgdesc="An open-source, interactive graphing library" arch=('x86_64') url="https://github.com/plotly/plotly.py" @@ -44,7 +44,7 @@ sha256sums=('33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4') build() { cd plotly.py-${pkgver}/packages/python/plotly - NODE_OPTIONS=--openssl-legacy-provider python setup.py build + SKIP_NPM=1 NODE_OPTIONS=--openssl-legacy-provider python setup.py build } check() { @@ -54,7 +54,7 @@ check() { package() { cd plotly.py-${pkgver}/packages/python/plotly - python setup.py install --root="${pkgdir}" --optimize=1 --skip-build + SKIP_NPM=1 python setup.py install --root="${pkgdir}" --optimize=1 --skip-build install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } From 95cd6fc02061e4d2191d44089cc8baeb482f7e98 Mon Sep 17 00:00:00 2001 From: Greyson Christoforo Date: Fri, 13 Jan 2023 18:39:03 +0000 Subject: [PATCH 5/5] remove npm stuff and move etc/ --- .SRCINFO | 3 +-- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 382a96e..27a27ff 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = python-plotly pkgdesc = An open-source, interactive graphing library pkgver = 5.12.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/plotly/plotly.py arch = x86_64 license = MIT @@ -11,7 +11,6 @@ pkgbase = python-plotly makedepends = python-jupyter_core makedepends = python-tornado makedepends = jupyterlab - makedepends = npm depends = python depends = python-tenacity optdepends = ipython diff --git a/PKGBUILD b/PKGBUILD index 1daab4c..956712d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgname=python-plotly pkgver=5.12.0 -pkgrel=3 +pkgrel=4 pkgdesc="An open-source, interactive graphing library" arch=('x86_64') url="https://github.com/plotly/plotly.py" @@ -32,7 +32,6 @@ python-setuptools python-jupyter_core python-tornado jupyterlab -npm ) checkdepends=( python-requests @@ -44,7 +43,7 @@ sha256sums=('33548f8abc3310acde8ba7d74a57a652ed278ef5c4a999a61ae9fb45cb1961e4') build() { cd plotly.py-${pkgver}/packages/python/plotly - SKIP_NPM=1 NODE_OPTIONS=--openssl-legacy-provider python setup.py build + SKIP_NPM=1 python setup.py build } check() { @@ -55,6 +54,7 @@ check() { package() { cd plotly.py-${pkgver}/packages/python/plotly SKIP_NPM=1 python setup.py install --root="${pkgdir}" --optimize=1 --skip-build + mv ${pkgdir}/usr/etc ${pkgdir} install -Dm644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" }