summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSoniEx2 <endermoneymod@gmail.com>2020-02-24 10:02:21 -0300
committerSoniEx2 <endermoneymod@gmail.com>2020-02-24 10:02:21 -0300
commita89d3537757cc74f3e6652565487eab36537b4ed (patch)
treebd56718c81926914b2f762a3cf33211c5ea5b34c
parentba628500304ecf9460d7d39d7fb794e15401eb00 (diff)
Update abdl.py so we can use key predicates
-rw-r--r--ganarchy/config.py2
-rw-r--r--requirements.txt11
2 files changed, 7 insertions, 6 deletions
diff --git a/ganarchy/config.py b/ganarchy/config.py
index 59766ed..f1a0cd6 100644
--- a/ganarchy/config.py
+++ b/ganarchy/config.py
@@ -26,7 +26,7 @@ from enum import Enum
 # validate = error on invalid entries
 CONFIG_REPOS_SANITIZE = abdl.compile("""->'projects'?:?$dict
                                           ->commit/[0-9a-fA-F]{40}|[0-9a-fA-F]{64}/?:?$dict
-                                            ->url:?$dict
+                                            ->url[:?$uri]:?$dict
                                               ->branch:?$dict(->'active'?:?$bool)""", {'bool': bool, 'dict': dict, 'uri': object})#URIValidator})
 CONFIG_REPOS = abdl.compile("->'projects'->commit->url->branch", {'dict': dict})
 
diff --git a/requirements.txt b/requirements.txt
index 0fd42f6..9d23dab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,11 +1,12 @@
--e git+https://soniex2.autistic.space/git-repos/abdl.git@1b26ad799217af7e187fdae78e862a6bf46e5591#egg=gan0f74bd87a23b515b45da7e6f5d9cc82380443dab
+-e git+https://soniex2.autistic.space/git-repos/abdl.git@6f4df5d08e147f74f91bf7ce2f882dca1390c721#egg=gan0f74bd87a23b515b45da7e6f5d9cc82380443dab
+Click==7.0
+Jinja2==2.10.1
+qtoml==0.2.4
+requests==2.22.0
+
 certifi==2019.11.28
 chardet==3.0.4
-Click==7.0
 idna==2.8
-Jinja2==2.10.1
 MarkupSafe==1.1.1
 pyparsing==2.4.2
-qtoml==0.2.4
-requests==2.22.0
 urllib3==1.25.7