Migrate latest Hy 1.0a4 with Hyrule

YtoTech · Feb 6, 2022 · 5be6ebf · 5be6ebf
1 parent a1a97df
commit 5be6ebf
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 182 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.3.0
+
+* Migrate to [Hy 1.0a4](https://github.com/hylang/hy/releases/tag/1.0a4) and support Python 3.10
+
 # 0.2.2
 
 * Fix counts optional prestations inside sections for `optional_prestations`

diff --git a/Pipfile b/Pipfile
@@ -6,6 +6,7 @@ name = "pypi"
 [packages]
 hy = ">=1.0a2"
 toolz = "*"
+hyrule = "*"
 
 [dev-packages]
 black = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 
 setup(
     name="tqwgp-parser",
-    version="0.2.2",
+    version="0.3.0",
     url="https://github.com/YtoTech/talk-quote-work-getpaid-parser",
     license="AGPL-3.0",
     author="Yoan Tournade",
@@ -24,5 +24,5 @@
     },
     zip_safe=False,
     platforms="any",
-    install_requires=["hy>=1.0a2", "toolz"],
+    install_requires=["hy>=1.0a4", "toolz", "hyrule"],
 )
diff --git a/tqwgp_parser/parser.hy b/tqwgp_parser/parser.hy
@@ -6,7 +6,8 @@
     :copyright: (c) 2017-2021 Yoan Tournade.
 """
 (import os)
-(import [.utils [*]])
+(import .utils *)
+(import hyrule [reduce])
 
 ;; Data parsing and normalization.
 

diff --git a/tqwgp_parser/utils.hy b/tqwgp_parser/utils.hy
@@ -1,7 +1,8 @@
 ; (require [hy.extra.anaphoric [ap-each]])
 
 (import copy)
-(import [toolz.itertoolz [drop]])
+(import toolz.itertoolz [drop])
+(require hyrule [assoc])
 
 ; Predicates.