summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillemw122016-08-31 18:37:57 +0200
committerwillemw122016-08-31 18:37:57 +0200
commit37b4c50c3fe9238b6e0a174dc2bd8265e3bacaff (patch)
tree6526a3731a14f269c3a3fd40b21f825f8cdd7927
parent0f265aefee9ff4ce5cfa918ff5d42a48197b6a86 (diff)
downloadaur-37b4c50c3fe9238b6e0a174dc2bd8265e3bacaff.tar.gz
Improve pep8 patch. Fix spyder.svg path.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD15
2 files changed, 6 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5fe93271342..292d7576978 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = spyder-git
- pkgver = 3.0.0b4.r5.g48c9672
+ pkgver = 3.0.0b6.r2.g3b512d9
pkgrel = 1
url = https://github.com/spyder-ide/spyder
install = spyder-git.install
diff --git a/PKGBUILD b/PKGBUILD
index 8f9139610d4..09ce28828df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ _pkgname2=spyder
_pkgname3=spyder3
pkgbase=$_pkgname2-git
pkgname=($_pkgname2-git $_pkgname3-git)
-pkgver=3.0.0b4.r5.g48c9672
+pkgver=3.0.0b6.r2.g3b512d9
pkgrel=1
arch=('any')
url="https://github.com/spyder-ide/spyder"
@@ -22,12 +22,7 @@ pkgver() {
}
prepare() {
- sed -i 's|"pep8"|"pycodestyle"|g' $_pkgname2/spyderlib/utils/codeanalysis.py
- sed -i "s|'pep8'|'pycodestyle'|g" $_pkgname2/create_app.py \
- $_pkgname2/setup.py \
- $_pkgname2/spyderlib/plugins/editor.py \
- $_pkgname2/spyderlib/utils/codeanalysis.py \
- $_pkgname2/spyderlib/widgets/editor.py
+ find $_pkgname2 -type f -iname \*.py -exec sed -i -e 's|"pep8"|"pycodestyle"|g' -e "s|'pep8'|'pycodestyle'|g" '{}' \;
rm -rf $_pkgname3
cp -a $_pkgname2 $_pkgname3
@@ -45,7 +40,7 @@ package_spyder-git() {
pkgdesc="Scientific PYthon Development EnviRonment providing MATLAB-like features (Python 2 version)"
# Note: 'ipython2-notebook' contains QTConsole
# Note: 'ipython2' (dependency of 'ipython2-notebook') contains Pickleshare
- # Note: 'ipython2-notebook' nor 'jupyter' contain a Python 2 version of Nbconvert
+ # Note: 'ipython2-notebook' nor 'jupyter'/'jupyter-nbconvert' contain a Python 2 version of Nbconvert
# 'icu'
depends=('python2-pyqt5'
'ipython2-notebook'
@@ -76,7 +71,7 @@ package_spyder-git() {
cd $_pkgname2
python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
# Install a scalable icon for the spyder.desktop file
- install -Dm644 spyderlib/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder.svg"
+ install -Dm644 spyder/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder.svg"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname2/LICENSE"
rm -f "$pkgdir/usr/bin/spyder_win_post_install.py"
}
@@ -115,7 +110,7 @@ package_spyder3-git() {
cd $_pkgname3
python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
# Install a scalable icon for the spyder3.desktop file
- install -Dm644 spyderlib/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder3.svg"
+ install -Dm644 spyder/images/spyder.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/spyder3.svg"
install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_pkgname3/LICENSE"
rm -f "$pkgdir/usr/bin/spyder_win_post_install.py"
}