summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtakar Jašek2019-10-14 14:34:26 +0200
committerOtakar Jašek2019-10-14 14:34:26 +0200
commit975623ea85a5c140b427ff0abb79cdc4054022c8 (patch)
treee4ee4f7ee45f98caf32cb1e5c21cef3063d7d35a
parent6a0d047ae3388a89514d8d33923b629a76c11eed (diff)
downloadaur-975623ea85a5c140b427ff0abb79cdc4054022c8.tar.gz
Update
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD21
-rw-r--r--visdom.conf1
-rw-r--r--visdom.group.conf1
-rw-r--r--visdom.install9
-rw-r--r--visdom2.conf1
6 files changed, 27 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 88290883b51..58cd343a341 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = python-visdom-git
pkgdesc = Visualization tool for Pytorch by Facebook
- pkgver = r274.35a3576
+ pkgver = r288.bb0ab59
pkgrel = 1
url = https://github.com/facebookresearch/visdom
arch = any
@@ -10,7 +10,13 @@ pkgbase = python-visdom-git
makedepends = python2-setuptools
options = !emptydirs
source = git+https://github.com/facebookresearch/visdom.git
+ source = visdom.conf
+ source = visdom2.conf
+ source = visdom.group.conf
sha256sums = SKIP
+ sha256sums = f795c8a3185282b366e7942b07b5ac74b9c293d1eb0f15727cf26905c1d7934e
+ sha256sums = f795c8a3185282b366e7942b07b5ac74b9c293d1eb0f15727cf26905c1d7934e
+ sha256sums = d71fbfa6bb3feecfb1997a459da196f8a2f0f50b33428043921803d97db5562c
pkgname = python-visdom-git
install = visdom.install
@@ -21,12 +27,12 @@ pkgname = python-visdom-git
depends = python-tornado
depends = python-pyzmq
depends = python-six
- depends = python-torchfile
+ depends = python-jsonpatch
provides = python-visdom
conflicts = python-visdom
pkgname = python2-visdom-git
- install = visdom2.install
+ install = visdom.install
depends = python2-websocket-client
depends = python2-numpy
depends = python2-scipy
@@ -34,7 +40,7 @@ pkgname = python2-visdom-git
depends = python2-tornado
depends = python2-pyzmq
depends = python2-six
- depends = python2-torchfile
+ depends = python2-jsonpatch
provides = python2-visdom
conflicts = python2-visdom
diff --git a/PKGBUILD b/PKGBUILD
index ed541b316e7..8b7c944489a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgbase=python-visdom-git
_pkgbase="visdom"
pkgname=(python-visdom-git python2-visdom-git)
-pkgver=r274.35a3576
+pkgver=r288.bb0ab59
pkgrel=1
arch=(any)
url='https://github.com/facebookresearch/visdom'
@@ -18,8 +18,11 @@ makedepends=(
'python2-setuptools'
)
options=(!emptydirs)
-source=("git+https://github.com/facebookresearch/visdom.git")
-sha256sums=('SKIP')
+source=("git+https://github.com/facebookresearch/visdom.git" "visdom.conf" "visdom2.conf" "visdom.group.conf")
+sha256sums=('SKIP'
+ 'f795c8a3185282b366e7942b07b5ac74b9c293d1eb0f15727cf26905c1d7934e'
+ 'f795c8a3185282b366e7942b07b5ac74b9c293d1eb0f15727cf26905c1d7934e'
+ 'd71fbfa6bb3feecfb1997a459da196f8a2f0f50b33428043921803d97db5562c')
pkgver() {
cd "${_pkgbase}"
@@ -27,24 +30,26 @@ pkgver() {
}
package_python-visdom-git() {
-depends=('python-websocket-client' 'python-numpy' 'python-scipy' 'python-requests' 'python-tornado' 'python-pyzmq' 'python-six' 'python-torchfile')
+depends=('python-websocket-client' 'python-numpy' 'python-scipy' 'python-requests' 'python-tornado' 'python-pyzmq' 'python-six' 'python-jsonpatch')
provides=('python-visdom')
conflicts=('python-visdom')
install='visdom.install'
cd "${srcdir}/${_pkgbase}"
python setup.py install --root="${pkgdir}/" --optimize=1
install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- chmod -R 775 "${pkgdir}/usr/lib/python3.7/site-packages/${_pkgbase}"
+ install -Dm 644 "${srcdir}/${_pkgbase}.group.conf" "${pkgdir}/usr/lib/sysusers.d/${_pkgbase}.group.conf"
+ install -Dm 644 "${srcdir}/${_pkgbase}.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgbase}.conf"
}
package_python2-visdom-git() {
-depends=('python2-websocket-client' 'python2-numpy' 'python2-scipy' 'python2-requests' 'python2-tornado' 'python2-pyzmq' 'python2-six' 'python2-torchfile')
+depends=('python2-websocket-client' 'python2-numpy' 'python2-scipy' 'python2-requests' 'python2-tornado' 'python2-pyzmq' 'python2-six' 'python2-jsonpatch')
provides=('python2-visdom')
conflicts=('python2-visdom')
-install='visdom2.install'
+install='visdom.install'
cd "${srcdir}/${_pkgbase}"
python2 setup.py install --root="${pkgdir}/" --optimize=1
mv "${pkgdir}/usr/bin/visdom" "${pkgdir}/usr/bin/visdom2"
install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
- chmod -R 775 "${pkgdir}/usr/lib/python2.7/site-packages/${_pkgbase}"
+ install -Dm 644 "${srcdir}/${_pkgbase}.group.conf" "${pkgdir}/usr/lib/sysusers.d/${_pkgbase}.group.conf"
+ install -Dm 644 "${srcdir}/${_pkgbase}2.conf" "${pkgdir}/usr/lib/tmpfiles.d/${_pkgbase}.conf"
}
diff --git a/visdom.conf b/visdom.conf
new file mode 100644
index 00000000000..73bc0ddbf1a
--- /dev/null
+++ b/visdom.conf
@@ -0,0 +1 @@
+Z /usr/lib/python3.7/site-packages/visdom/static/ 775 - visdom
diff --git a/visdom.group.conf b/visdom.group.conf
new file mode 100644
index 00000000000..e8257a93420
--- /dev/null
+++ b/visdom.group.conf
@@ -0,0 +1 @@
+g visdom -
diff --git a/visdom.install b/visdom.install
index 569ae0682cd..93db7954e4a 100644
--- a/visdom.install
+++ b/visdom.install
@@ -1,11 +1,4 @@
post_install(){
- groupadd -f visdom
- chown -R :visdom /usr/lib/python3.7/site-packages/visdom
- chmod -R g+w /usr/lib/python3.7/site-packages/visdom
- echo -e "\n\nAdd yourself into visdom group\n\n"
-}
-
-post_remove(){
- if ! [ -d /usr/lib/python2.7/site-packages/visdom ] ; then groupdel visdom ; fi
+ echo -e "\n\nAdd yourself into visdom group, if you want to use it as a server\n\n"
}
diff --git a/visdom2.conf b/visdom2.conf
new file mode 100644
index 00000000000..73bc0ddbf1a
--- /dev/null
+++ b/visdom2.conf
@@ -0,0 +1 @@
+Z /usr/lib/python3.7/site-packages/visdom/static/ 775 - visdom