testing/hy: upgrade to 0.18.0

2 files changed, 5 insertions, 58 deletions

diff --git a/testing/hy/0001-get_version.py-allow-specifying-version-in-environme.patch b/testing/hy/0001-get_version.py-allow-specifying-version-in-environme.patch
deleted file mode 100644
index 6c09b38537..0000000000
--- a/testing/hy/0001-get_version.py-allow-specifying-version-in-environme.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 31041f1713f9a22176b3610a9b619db52004ddb0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Mon, 23 Sep 2019 20:35:48 +0200
-Subject: [PATCH] get_version.py: allow specifying version in environment
- variable
-
-While packaging hy for Alpine Linux I noticed that the VERSIONFILE is
-ignored if hy is build in a git repository. On Alpine the packages are
-build in the package repository resulting in a wrong hy version. This
-change allows specifying the version in an environment variable which is
-preferred over git-describe(1) and the VERSIONFILE.
----
- get_version.py | 27 +++++++++++++++------------
- 1 file changed, 15 insertions(+), 12 deletions(-)
-
-diff --git a/get_version.py b/get_version.py
-index 759336d..9224f59 100644
---- a/get_version.py
-+++ b/get_version.py
-@@ -5,16 +5,19 @@ import os, subprocess, runpy
- os.chdir(os.path.split(os.path.abspath(__file__))[0])
- VERSIONFILE = os.path.join("hy", "version.py")
- 
--try:
--    __version__ = (subprocess.check_output
--                   (["git", "describe", "--tags", "--dirty"])
--                   .decode('ASCII').strip()
--                   .replace('-', '+', 1).replace('-', '.'))
--    with open(VERSIONFILE, "wt") as o:
--        o.write("__version__ = {!r}\n".format(__version__))
-+if "HY_VERSION" in os.environ:
-+    __version__ = os.environ["HY_VERSION"]
-+else:
-+    try:
-+        __version__ = (subprocess.check_output
-+                       (["git", "describe", "--tags", "--dirty"])
-+                       .decode('ASCII').strip()
-+                       .replace('-', '+', 1).replace('-', '.'))
-+        with open(VERSIONFILE, "wt") as o:
-+            o.write("__version__ = {!r}\n".format(__version__))
- 
--except (subprocess.CalledProcessError, OSError):
--    if os.path.exists(VERSIONFILE):
--        __version__ = runpy.run_path(VERSIONFILE)['__version__']
--    else:
--        __version__ = "unknown"
-+    except (subprocess.CalledProcessError, OSError):
-+        if os.path.exists(VERSIONFILE):
-+            __version__ = runpy.run_path(VERSIONFILE)['__version__']
-+        else:
-+            __version__ = "unknown"
diff --git a/testing/hy/APKBUILD b/testing/hy/APKBUILD
index 351cf9c369..28938ce545 100644
--- a/testing/hy/APKBUILD
+++ b/testing/hy/APKBUILD
@@ -1,17 +1,16 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=hy
-pkgver=0.17.0
+pkgver=0.18.0
 pkgrel=0
 pkgdesc="Dialect of Lisp that's embedded in Python"
 url="http://hylang.org/"
 arch="noarch"
 license="MIT"
-depends="python3 py3-funcparserlib py3-astor py3-rply py3-clint"
+depends="python3 py3-funcparserlib py3-astor py3-rply py3-clint py3-colorama"
 makedepends="py3-setuptools"
-checkdepends="python3-tests py3-pytest py3-pytest-runner py3-setuptools py3-tox"
-source="$pkgname-$pkgver.tar.gz::https://github.com/hylang/$pkgname/archive/$pkgver.tar.gz
-	0001-get_version.py-allow-specifying-version-in-environme.patch"
+checkdepends="python3-tests py3-pytest py3-pytest-runner py3-tox"
+source="$pkgname-$pkgver.tar.gz::https://github.com/hylang/hy/archive/$pkgver.tar.gz"
 
 # By default setup.py tries to determine the hy version using
 # git-describe(1). Unfourtunatly, this will return the version
@@ -36,5 +35,4 @@ package() {
 	rm -rf "$pkgdir"/usr/get_version
 }
 
-sha512sums="18601bf47df2120f8833a1ae211c416dc90825f31cd50b259adfe0585089a623d0fea13512b2935b093e14d8595c93bc1610939d5f1d664f6acf7ddf7e341542  hy-0.17.0.tar.gz
-4676ff5b4a48f6b3aff7667688a6eca96419fc6c61deb66b53d94b1a4618460f9274b6380c20b3182827474aa9b6158864eadc803cb400557a23fc6150344d2b  0001-get_version.py-allow-specifying-version-in-environme.patch"
+sha512sums="ff578eb6ca70f82492b37bfcc41167e8f8d50337bbdd6b049edb654163b60156a65933aa723ea357fee0f84dc25837d70bd00251760fa2b00f599088e592d97c  hy-0.18.0.tar.gz"