aridity 70__tar.gz → 71__tar.gz

{aridity-70 → aridity-71}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 70
+Version: 71
 Summary: DRY config and template system, easily extensible with Python
-Home-page: UNKNOWN
+Home-page: https://pypi.org/project/aridity/
 Author: foyono
+Author-email: shrovis@foyono.com
 License: UNKNOWN
 Platform: UNKNOWN
 Description-Content-Type: text/markdown
@@ -75,6 +76,7 @@ pip3 install --user aridity
 If you prefer to keep .local clean, install to a virtualenv:
 ```
 python3 -m venv venvname
+venvname/bin/pip install -U pip
 venvname/bin/pip install aridity
 . venvname/bin/activate
 ```

{aridity-70 → aridity-71}/README.md

@@ -65,6 +65,7 @@ pip3 install --user aridity
 If you prefer to keep .local clean, install to a virtualenv:
 ```
 python3 -m venv venvname
+venvname/bin/pip install -U pip
 venvname/bin/pip install aridity
 . venvname/bin/activate
 ```

{aridity-70 → aridity-71}/aridity/config.py

@@ -1,3 +1,4 @@
+from .functions import OpaqueKey
 from .model import Entry, Function, Locator, Number, Resource, Scalar, Stream, Text, wrap
 from .repl import Repl
 from .scope import Scope
@@ -198,6 +199,10 @@ class RConfig(object):
         except AttributeError:
             return query.r
 
+    def __iter__(self):
+        for _, o in ctrls[self].scope(True).resolveditems(): # TODO: Investigate how iteration should work.
+            yield o.scalar
+
 class WConfig(object):
 
     def __getattr__(self, name):
@@ -206,3 +211,8 @@ class WConfig(object):
     def __setattr__(self, name, value):
         query = ctrls[self].addname(name)
         query.basescope[tuple(query.prefix)] = wrap(value)
+
+    def __iadd__(self, value):
+        query = ctrls[self].addname(OpaqueKey())
+        query.basescope[tuple(query.prefix)] = wrap(value)
+        return self

{aridity-70 → aridity-71}/aridity/model.py

@@ -427,6 +427,13 @@ class Entry(Struct):
         return Concat.unlesssingleton(indent).resolve(None).cat()
 
 def wrap(value):
+    from .config import ctrls
+    try:
+        ctrl = ctrls[value]
+    except (KeyError, TypeError):
+        pass
+    else:
+        return ctrl.scope(True)
     for b in map(bool, range(2)):
         if value is b:
             return Boolean(value)

{aridity-70 → aridity-71}/aridity.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: aridity
-Version: 70
+Version: 71
 Summary: DRY config and template system, easily extensible with Python
-Home-page: UNKNOWN
+Home-page: https://pypi.org/project/aridity/
 Author: foyono
+Author-email: shrovis@foyono.com
 License: UNKNOWN
 Platform: UNKNOWN
 Description-Content-Type: text/markdown
@@ -75,6 +76,7 @@ pip3 install --user aridity
 If you prefer to keep .local clean, install to a virtualenv:
 ```
 python3 -m venv venvname
+venvname/bin/pip install -U pip
 venvname/bin/pip install aridity
 . venvname/bin/activate
 ```

aridity-71/setup.py

@@ -0,0 +1,21 @@
+from setuptools import find_packages, setup
+
+def long_description():
+    with open('README.md') as f:
+        return f.read()
+
+setup(
+    name = 'aridity',
+    version = '71',
+    description = 'DRY config and template system, easily extensible with Python',
+    long_description = long_description(),
+    long_description_content_type = 'text/markdown',
+    url = 'https://pypi.org/project/aridity/',
+    author = 'foyono',
+    author_email = 'shrovis@foyono.com',
+    packages = find_packages(),
+    py_modules = [],
+    install_requires = ['importlib-metadata>=2.1.3', 'importlib-resources>=3.3.1', 'pyparsing==2.4.7'],
+    package_data = {'': ['*.pxd', '*.pyx', '*.pyxbld', '*.arid', '*.aridt']},
+    entry_points = {'console_scripts': ['aridity=aridity.__init__:main', 'arid-config=aridity.arid_config:main', 'processtemplate=aridity.processtemplate:main']},
+)

aridity-70/setup.py

@@ -1,99 +0,0 @@
-import setuptools
-
-def long_description():
-    with open('README.md') as f:
-        return f.read()
-
-class SourceInfo:
-
-    class PYXPath:
-
-        suffixes = '.pyx', '.c'
-
-        def __init__(self, module, path):
-            self.module = module
-            self.path = path
-
-        def buildrequires(self):
-            if self.path.endswith('.pyx'):
-                yield 'Cython<3'
-
-        def make_ext(self):
-            g = {}
-            with open(self.path + 'bld') as f: # Assume project root.
-                exec(f.read(), g)
-            return g['make_ext'](self.module, self.path)
-
-    def __init__(self, rootdir):
-        import os, setuptools, subprocess
-        self.packages = setuptools.find_packages(rootdir)
-        extpaths = {}
-        def addextpaths(dirpath, moduleprefix):
-            names = sorted(os.listdir(os.path.join(rootdir, dirpath)))
-            for suffix in self.PYXPath.suffixes:
-                for name in names:
-                    if name.endswith(suffix):
-                        module = "%s%s" % (moduleprefix, name[:-len(suffix)])
-                        if module not in extpaths:
-                            extpaths[module] = self.PYXPath(module, os.path.join(dirpath, name))
-        addextpaths('.', '')
-        for package in self.packages:
-            addextpaths(package.replace('.', os.sep), "%s." % package)
-        extpaths = extpaths.values()
-        if extpaths and os.path.isdir(os.path.join(rootdir, '.git')): # We could be an unpacked sdist.
-            check_ignore = subprocess.Popen(['git', 'check-ignore'] + [p.path for p in extpaths], cwd = rootdir, stdout = subprocess.PIPE)
-            ignoredpaths = set(check_ignore.communicate()[0].decode().splitlines())
-            assert check_ignore.wait() in [0, 1]
-            self.extpaths = [path for path in extpaths if path.path not in ignoredpaths]
-        else:
-            self.extpaths = extpaths
-
-def lazy(clazz, init, *initbefore):
-    from threading import Lock
-    initlock = Lock()
-    init = [init]
-    def overridefactory(name):
-        orig = getattr(clazz, name)
-        def override(*args, **kwargs):
-            with initlock:
-                if init:
-                    init[0](obj)
-                    del init[:]
-            return orig(*args, **kwargs)
-        return override
-    Lazy = type('Lazy', (clazz, object), {name: overridefactory(name) for name in initbefore})
-    obj = Lazy()
-    return obj
-
-# FIXME: The idea was to defer anything Cython/numpy to pyximport time, but this doesn't achieve that.
-def cythonize(extensions):
-    def init(ext_modules):
-        ordinary = []
-        cythonizable = []
-        for e in extensions:
-            (cythonizable if any(s.endswith('.pyx') for s in e.sources) else ordinary).append(e)
-        if cythonizable:
-            from Cython.Build import cythonize
-            ordinary += cythonize(cythonizable)
-        ext_modules[:] = ordinary
-    return lazy(list, init, '__getitem__', '__iter__', '__len__')
-
-def ext_modules():
-    extensions = [path.make_ext() for path in sourceinfo.extpaths]
-    return dict(ext_modules = cythonize(extensions)) if extensions else {}
-
-sourceinfo = SourceInfo('.')
-setuptools.setup(
-        name = 'aridity',
-        version = '70',
-        description = 'DRY config and template system, easily extensible with Python',
-        long_description = long_description(),
-        long_description_content_type = 'text/markdown',
-        url = None,
-        author = 'foyono',
-        packages = sourceinfo.packages,
-        py_modules = [],
-        install_requires = ['importlib-metadata>=2.1.3', 'importlib-resources>=3.3.1', 'pyparsing==2.4.7'],
-        package_data = {'': ['*.pxd', '*.pyx', '*.pyxbld', '*.arid', '*.aridt']},
-        entry_points = {'console_scripts': ['aridity=aridity.__init__:main', 'arid-config=aridity.arid_config:main', 'processtemplate=aridity.processtemplate:main']},
-        **ext_modules())