update to v0.12.0

3 files changed, 62 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 348a67df41fe..b7b161ac2d49 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,23 @@
 pkgbase = python-enaml
 	pkgdesc = Declarative DSL for building rich user interfaces in Python
-	pkgver = 0.10.2
+	pkgver = 0.12.0
 	pkgrel = 00
 	url = https://github.com/nucleic/enaml
 	arch = x86_64
-	license = custom:
+	license = BSD
 	makedepends = python-pip
 	makedepends = python-wheel
 	depends = python
-	depends = python-qtpy
-	depends = python-future
 	depends = python-ply
-	depends = python-kiwisolver
-	depends = python-setuptools
 	depends = python-atom
+	depends = python-bytecode
+	depends = python-kiwisolver
 	source = PKGBUILD_EXTRAS
-	source = https://files.pythonhosted.org/packages/30/fe/b95b1a93d6296c1c16a618d857c0a892a80d7e5bc7cbb506acad9818d6b6/enaml-0.10.2.tar.gz
+	source = https://files.pythonhosted.org/packages/d5/d5/b3e88ac554ea36b77d08b612e3259d998ad9868ac60f3c60918377c9999f/enaml-0.12.0.tar.gz
 	source = LICENSE
 	md5sums = SKIP
-	md5sums = 4bd4157f88e9b5a28385dea73ef20e74
-	md5sums = 7b198a7b1296c1659830cbb4f1c65f2e
+	md5sums = 8e77a894b8546ee8a4678dfb3aad25a3
+	md5sums = 9498cbdb4d81d88314d3baca05dcbe5f
 
 pkgname = python-enaml
 
diff --git a/LICENSE b/LICENSE
index c87cce88e662..ed5e03afced4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -88,9 +88,9 @@ With this in mind, the following banner should be used in any source code file
 to indicate the copyright and license terms:
 
 #------------------------------------------------------------------------------
-# Copyright (c) 2013-2018, Nucleic Development Team.
+# Copyright (c) 2013-2019, Nucleic Development Team.
 #
 # Distributed under the terms of the Modified BSD License.
 #
-# The full license is in the file COPYING.txt, distributed with this software.
+# The full license is in the file LICENSE, distributed with this software.
 #------------------------------------------------------------------------------
diff --git a/PKGBUILD b/PKGBUILD
index 6e996d4c1ad8..8fe77337480c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,13 +5,13 @@ export PIP_DISABLE_PIP_VERSION_CHECK=true
 
 pkgname=python-enaml
 epoch=
-pkgver=0.10.2
+pkgver=0.12.0
 pkgrel=00
 pkgdesc='Declarative DSL for building rich user interfaces in Python'
 arch=(x86_64)
 url=https://github.com/nucleic/enaml
-license=(custom:)
-depends=(python python-qtpy python-future python-ply python-kiwisolver python-setuptools python-atom)
+license=(BSD)
+depends=(python python-ply python-atom python-bytecode python-kiwisolver)
 depends+=()
 makedepends=(python-pip python-wheel)
 checkdepends=()
@@ -19,27 +19,37 @@ provides=()
 conflicts=(${provides%=*})  # No quotes, to avoid an empty entry.
 source=(PKGBUILD_EXTRAS)
 md5sums=(SKIP)
-source+=(https://files.pythonhosted.org/packages/30/fe/b95b1a93d6296c1c16a618d857c0a892a80d7e5bc7cbb506acad9818d6b6/enaml-0.10.2.tar.gz)
-md5sums+=(4bd4157f88e9b5a28385dea73ef20e74)
+noextract=()
+source+=(https://files.pythonhosted.org/packages/d5/d5/b3e88ac554ea36b77d08b612e3259d998ad9868ac60f3c60918377c9999f/enaml-0.12.0.tar.gz)
+md5sums+=(8e77a894b8546ee8a4678dfb3aad25a3)
 source+=(LICENSE)
-md5sums+=(7b198a7b1296c1659830cbb4f1c65f2e)
+md5sums+=(9498cbdb4d81d88314d3baca05dcbe5f)
+
 _first_source() {
     echo " ${source_i686[@]} ${source_x86_64[@]} ${source[@]}" |
         tr ' ' '\n' | grep -Pv '^(PKGBUILD_EXTRAS)?$' | head -1
 }
 
-if [[ $(_first_source) =~ ^git+ ]]; then
-    provides+=("${pkgname%-git}")
-    conflicts+=("${pkgname%-git}")
+_vcs="$(grep -Po '^[a-z]+(?=\+)' <<< "$(_first_source)")"
+if [[ "$_vcs" ]]; then
+    makedepends+=("$(pkgfile --quiet /usr/bin/$_vcs)")
+    provides+=("${pkgname%-$_vcs}")
+    conflicts+=("${pkgname%-$_vcs}")
 fi
 
 _is_wheel() {
     [[ $(_first_source) =~ \.whl$ ]]
 }
 
+if [[ _is_wheel &&
+      $(basename "$(_first_source)" | rev | cut -d- -f1 | rev) =~ ^manylinux ]]; then
+    options=(!strip)  # https://github.com/pypa/manylinux/issues/119
+fi
+
 _dist_name() {
-    basename "$(_first_source)" |
-      sed 's/\(\.tar\.gz\|\.tgz\|\.tar\.bz2\|\.zip\|\.git\)$//'
+    find "$srcdir" -mindepth 1 -maxdepth 1 -type d -printf '%f
+' |
+        grep -v '^_tmpenv$'
 }
 
 if [[ $(_first_source) =~ ^git+ ]]; then
@@ -58,7 +68,7 @@ fi
 
 _build() {
     if _is_wheel; then return; fi
-    cd "$srcdir/$(_dist_name)"
+    cd "$srcdir"
     # See Arch Wiki/PKGBUILD/license.
     # Get the first filename that matches.
     local test_name
@@ -69,11 +79,20 @@ _build() {
             fi
         done
     fi
+    # Use the latest version of pip, as Arch's version is historically out of
+    # date(!) and newer versions do fix bugs (sometimes).
+    python -mvenv --clear --system-site-packages _tmpenv
+    _tmpenv/bin/pip --quiet install -U pip
     # Build the wheel (which we allow to fail) only after fetching the license.
-    /usr/bin/pip wheel -v --no-deps --wheel-dir="$srcdir" \
-        --global-option=--no-user-cfg \
-        --global-option=build --global-option=-j"$(nproc)" . ||
-        true
+    # In order to isolate from ~/.pydistutils.cfg, we need to set $HOME to a
+    # temporary directory, and thus first $XDG_CACHE_HOME back to its real
+    # location, so that pip inserts the wheel in the wheel cache.  We cannot
+    # use --global-option=--no-user-cfg instead because that fully disables
+    # wheels, causing a from-source build of build dependencies such as
+    # numpy/scipy.
+    XDG_CACHE_HOME="${XDG_CACHE_HOME:-"$HOME/.cache"}" HOME=_tmpenv \
+        _tmpenv/bin/pip wheel -v --no-deps --wheel-dir="$srcdir" \
+        "./$(_dist_name)" || true
 }
 
 build() { _build; }
@@ -89,9 +108,20 @@ _check() {
 _package() {
     cd "$srcdir"
     # pypa/pip#3063: pip always checks for a globally installed version.
-    /usr/bin/pip --quiet install --root="$pkgdir" \
+    python -mvenv --clear --system-site-packages _tmpenv
+    _tmpenv/bin/pip install --prefix="$pkgdir/usr" \
         --no-deps --ignore-installed --no-warn-script-location \
         "$(ls ./*.whl 2>/dev/null || echo ./"$(_dist_name)")"
+    if [[ -d "$pkgdir/usr/bin" ]]; then  # Fix entry points.
+        for f in "$pkgdir/usr/bin/"*; do
+            if [[ $(head -n1 "$f") = "#!$(readlink -f _tmpenv)/bin/python" ]]; then
+                sed -i '1c#!/usr/bin/python' "$f"
+            fi
+        done
+    fi
+    if [[ -d "$pkgdir/usr/etc" ]]; then
+        mv "$pkgdir/usr/etc" "$pkgdir/etc"
+    fi
     if [[ -f LICENSE ]]; then
         install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     fi
@@ -100,3 +130,9 @@ _package() {
 package() { _package; }
 
 . "$(dirname "$BASH_SOURCE")/PKGBUILD_EXTRAS"
+
+# Remove makedepends already in depends (which may have been listed for the
+# first build, but autodetected on the second.
+makedepends=($(printf '%s\n' "${makedepends[@]}" |
+               grep -Pwv "^($(IFS='|'; echo "${depends[*]}"))$"))
+:  # Apparently ending with makedepends assignment sometimes fails.