Concern 33__tar.gz → 35__tar.gz

{concern-33 → concern-35/Concern.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Concern
-Version: 33
+Version: 35
 Summary: Control pym2149 (via Lurlene) or FoxDot using Vim
 Home-page: https://github.com/combatopera/Concern
 Author: Andrzej Cichocki
@@ -8,6 +8,7 @@ Author-email: 3613868+combatopera@users.noreply.github.com
 Description-Content-Type: text/markdown
 License-File: COPYING
 Requires-Dist: aridity>=84
+Requires-Dist: foyndation>=10
 Requires-Dist: lagoon>=50
 Requires-Dist: timelyOSC>=4
 

{concern-33 → concern-35}/Concern.egg-info/requires.txt

@@ -1,3 +1,4 @@
 aridity>=84
+foyndation>=10
 lagoon>=50
 timelyOSC>=4

{concern-33/Concern.egg-info → concern-35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Concern
-Version: 33
+Version: 35
 Summary: Control pym2149 (via Lurlene) or FoxDot using Vim
 Home-page: https://github.com/combatopera/Concern
 Author: Andrzej Cichocki
@@ -8,6 +8,7 @@ Author-email: 3613868+combatopera@users.noreply.github.com
 Description-Content-Type: text/markdown
 License-File: COPYING
 Requires-Dist: aridity>=84
+Requires-Dist: foyndation>=10
 Requires-Dist: lagoon>=50
 Requires-Dist: timelyOSC>=4
 

{concern-33 → concern-35}/concern/Concern.py

@@ -17,10 +17,10 @@
 
 'Vim-based live coding environment.'
 from . import templates
-from .util import initlogging
 from argparse import ArgumentParser
 from aridity.config import ConfigCtrl
-from aridity.util import openresource
+from foyndation import initlogging
+from importlib.resources import files
 from lagoon.util import wrappercli
 from pathlib import Path
 from screen import stuffablescreen
@@ -45,8 +45,9 @@ def main():
     configdir.mkdir(parents = True, exist_ok = True)
     with TemporaryDirectory(dir = configdir) as sessiondir:
         config.sessiondir = sessiondir
+        parent = files(templates.__spec__.parent)
         for c in config.T:
-            with openresource(templates.__name__, c.templatename) as f:
+            with (parent / c.templatename).open(encoding = 'ascii') as f:
                 (-c.context).processtemplate(f, c.P)
         stuffablescreen(config.doubleQuoteKey)[print]('-S', config.sessionName, '-c', config.T.screenrc.P)
 

{concern-33 → concern-35}/concern/util.py

@@ -18,14 +18,11 @@
 from aridity.model import Number, Text
 from struct import Struct
 from termios import TIOCGWINSZ
-import fcntl, logging, os, sys
+import fcntl, os, sys
 
 PYTHONPATH = os.pathsep.join(sys.path[1:]) # XXX: Include first entry?
 winsize = Struct('HHHH')
 
-def initlogging():
-    logging.basicConfig(format = "%(asctime)s %(levelname)s %(message)s", level = logging.DEBUG)
-
 def toabswidth(scope, resolvable):
     ws_col = winsize.unpack(fcntl.ioctl(sys.stdin, TIOCGWINSZ, bytes(winsize.size)))[1]
     return Number(round(resolvable.resolve(scope).scalar * (ws_col - 1))) # Take off 1 for the separator.

{concern-33 → concern-35}/setup.py

@@ -49,13 +49,13 @@ class SourceInfo:
 sourceinfo = SourceInfo('.')
 setup(
     name = 'Concern',
-    version = '33',
+    version = '35',
     description = 'Control pym2149 (via Lurlene) or FoxDot using Vim',
     url = 'https://github.com/combatopera/Concern',
     author = 'Andrzej Cichocki',
     author_email = '3613868+combatopera@users.noreply.github.com',
     py_modules = [],
-    install_requires = ['aridity>=84', 'lagoon>=50', 'timelyOSC>=4'],
+    install_requires = ['aridity>=84', 'foyndation>=10', 'lagoon>=50', 'timelyOSC>=4'],
     package_data = {'': ['*.pxd', '*.pyx', '*.pyxbld', '*.arid', '*.aridt']},
     entry_points = {'console_scripts': ['Concern=concern.Concern:main']},
     **sourceinfo.setup_kwargs(),