omdev 0.0.0.dev26__tar.gz → 0.0.0.dev27__tar.gz

{omdev-0.0.0.dev26/omdev.egg-info → omdev-0.0.0.dev27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev26
+Requires-Dist: omlish==0.0.0.dev27
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/datacache/__init__.py

@@ -2,7 +2,7 @@ from .cache import (  # noqa
     DataCache,
 )
 
-from .default import (  # noqa
+from .defaults import (  # noqa
     default,
     default_dir,
 )

omdev-0.0.0.dev27/omdev/datacache/actions.py

@@ -0,0 +1,36 @@
+import typing as ta
+
+from omlish import dataclasses as dc
+from omlish import lang
+from omlish import marshal as msh
+
+from .consts import SERIALIZATION_VERSION
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class Action(lang.Abstract, lang.Sealed):
+    serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
+
+
+##
+
+
+@dc.dataclass(frozen=True)
+class ExtractAction(Action, lang.Final):
+    files: ta.Sequence[str]
+
+
+##
+
+
+@lang.cached_function
+def _install_standard_marshalling() -> None:
+    actions_poly = msh.polymorphism_from_subclasses(Action)
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.PolymorphismMarshalerFactory(actions_poly)]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.PolymorphismUnmarshalerFactory(actions_poly)]
+
+
+_install_standard_marshalling()

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/datacache/cache.py

@@ -46,7 +46,7 @@ class DataCache:
         urllib.request.urlretrieve(url, out_file)  # noqa
 
     def _fetch_into(self, spec: CacheDataSpec, data_dir: str) -> None:
-        log.info('Fetching spec: %s %r', spec.digest, spec)
+        log.info('Fetching spec: %s %r -> %s', spec.digest, spec, data_dir)
 
         if isinstance(spec, HttpCacheDataSpec):
             self._fetch_url(spec.url, os.path.join(data_dir, spec.file_name_or_default))
@@ -69,7 +69,7 @@ class DataCache:
 
             log.info('Cloning git repo: %s -> %s', spec.url, tmp_dir)
 
-            git.clone_subtree(
+            git.git_clone_subtree(
                 base_dir=tmp_dir,
                 repo_url=spec.url,
                 repo_dir='data',
@@ -102,6 +102,14 @@ class DataCache:
                 raise RuntimeError(data_file)  # noqa
             return data_file
 
+        elif isinstance(spec, GithubContentCacheDataSpec):
+            if len(spec.files) != 1:
+                return data_dir
+            data_file = os.path.join(data_dir, check.single(spec.files))
+            if not os.path.isfile(data_file):
+                raise RuntimeError(data_file)  # noqa
+            return data_file
+
         else:
             return data_dir
 
@@ -141,9 +149,16 @@ class DataCache:
         with open(manifest_file, 'w') as f:
             f.write(manifest_json)
 
-        ##
+        #
+
+        # for p, ds, fs in os.walk(tmp_dir):
+        #     for n in [*ds, *fs]:
+        #         np = os.path.join(p, n)
+        #         os.chmod(np, os.stat(np).st_mode & ~0o222)
+
+        #
 
-        os.rename(tmp_dir, item_dir)
+        shutil.move(tmp_dir, item_dir)
 
         data_dir = os.path.join(item_dir, 'data')
         return self._return_val(spec, data_dir)

omdev-0.0.0.dev27/omdev/datacache/consts.py

@@ -0,0 +1 @@
+SERIALIZATION_VERSION = 0

omdev-0.0.0.dev27/omdev/datacache/defaults.py

@@ -0,0 +1,18 @@
+import os.path
+
+from omlish import lang
+
+from .cache import DataCache
+
+
+##
+
+
+@lang.cached_function(lock=True)
+def default_dir() -> str:
+    return os.path.expanduser('~/.cache/omlish/data')
+
+
+@lang.cached_function(lock=True)
+def default() -> DataCache:
+    return DataCache(default_dir())

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/datacache/manifests.py

@@ -4,8 +4,8 @@ from omlish import __about__ as about
 from omlish import cached
 from omlish import dataclasses as dc
 
-from ..revisions import get_git_revision
-from .consts import MARSHAL_VERSION
+from ..git import get_git_revision
+from .consts import SERIALIZATION_VERSION
 from .specs import CacheDataSpec
 
 
@@ -33,8 +33,8 @@ class CacheDataManifest:
     lib_version: str = dc.field(default_factory=lambda: about.__version__, kw_only=True)
     lib_revision: str = dc.field(default_factory=_lib_revision, kw_only=True)
 
-    marshal_version: int = dc.field(default=MARSHAL_VERSION, kw_only=True)
+    serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 
     @dc.validate
-    def _validate_marshal_versions(self) -> bool:
-        return self.marshal_version == self.spec.marshal_version
+    def _validate_serialization_versions(self) -> bool:
+        return self.serialization_version == self.spec.serialization_version

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/datacache/specs.py

@@ -10,7 +10,7 @@ from omlish import lang
 from omlish import marshal as msh
 from omlish.formats import json
 
-from .consts import MARSHAL_VERSION
+from .consts import SERIALIZATION_VERSION
 
 
 ##
@@ -18,11 +18,11 @@ from .consts import MARSHAL_VERSION
 
 @dc.dataclass(frozen=True)
 class CacheDataSpec(lang.Abstract, lang.Sealed):
-    marshal_version: int = dc.field(default=MARSHAL_VERSION, kw_only=True)
+    serialization_version: int = dc.field(default=SERIALIZATION_VERSION, kw_only=True)
 
     @cached.property
     def json(self) -> str:
-        return json.dumps_compact(msh.marshal(self, CacheDataSpec))
+        return json.dumps_compact(msh.marshal(self, CacheDataSpec), sort_keys=True)
 
     @cached.property
     def digest(self) -> str:

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/git.py

@@ -1,15 +1,17 @@
+# ruff: noqa: UP007
+# @omlish-lite
 import os.path
 import subprocess
 import typing as ta
 
 
-def clone_subtree(
+def git_clone_subtree(
         *,
         base_dir: str,
         repo_url: str,
         repo_dir: str,
-        branch: str | None = None,
-        rev: str | None = None,
+        branch: ta.Optional[str] = None,
+        rev: ta.Optional[str] = None,
         repo_subtrees: ta.Sequence[str],
 ) -> None:
     if not bool(branch) ^ bool(rev):
@@ -60,3 +62,39 @@ def clone_subtree(
         ],
         cwd=rd,
     )
+
+
+def get_git_revision(
+        *,
+        cwd: ta.Optional[str] = None,
+) -> ta.Optional[str]:
+    subprocess.check_output(['git', '--version'])
+
+    if cwd is None:
+        cwd = os.getcwd()
+
+    if subprocess.run([  # noqa
+        'git',
+        'rev-parse',
+        '--is-inside-work-tree',
+    ], stderr=subprocess.PIPE).returncode:
+        return None
+
+    has_untracked = bool(subprocess.check_output([
+        'git',
+        'ls-files',
+        '.',
+        '--exclude-standard',
+        '--others',
+    ], cwd=cwd).decode().strip())
+
+    dirty_rev = subprocess.check_output([
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+    ], cwd=cwd).decode().strip()
+
+    return dirty_rev + ('-untracked' if has_untracked else '')

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/manifests.py

@@ -1,5 +1,5 @@
 """
-!!! manifests! get-manifest, _manifest.py
+!!! manifests! get-manifest, .manifest.json
  - dumb dicts, root keys are 'types'
  - get put in _manifest.py, root level dict or smth
   - IMPORT files w comment
@@ -195,7 +195,7 @@ def build_package_manifests(
         manifests.extend(build_module_manifests(os.path.relpath(file, base), base))
 
     if write:
-        with open(os.path.join(pkg_dir, '_manifests.json'), 'w') as f:
+        with open(os.path.join(pkg_dir, '.manifests.json'), 'w') as f:
             f.write(json_dumps_pretty([dc.asdict(m) for m in manifests]))
             f.write('\n')
 

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/pyproject/pkg.py

@@ -139,6 +139,35 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
     #
 
+    class _PkgData(ta.NamedTuple):
+        inc: ta.List[str]
+        exc: ta.List[str]
+
+    @cached_nullary
+    def _collect_pkg_data(self) -> _PkgData:
+        inc: ta.List[str] = []
+        exc: ta.List[str] = []
+
+        for p, ds, fs in os.walk(self._dir_name):  # noqa
+            for f in fs:
+                if f != '.pkgdata':
+                    continue
+                rp = os.path.relpath(p, self._dir_name)
+                log.info('Found pkgdata %s for pkg %s', rp, self._dir_name)
+                with open(os.path.join(p, f)) as fo:
+                    src = fo.read()
+                for l in src.splitlines():
+                    if not (l := l.strip()):
+                        continue
+                    if l.startswith('!'):
+                        exc.append(os.path.join(rp, l[1:]))
+                    else:
+                        inc.append(os.path.join(rp, l))
+
+        return self._PkgData(inc, exc)
+
+    #
+
     @abc.abstractmethod
     def _write_file_contents(self) -> None:
         raise NotImplementedError
@@ -268,13 +297,56 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
 
         #
 
-        st = specs.setuptools
+        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
         st.pop('cexts', None)
 
-        self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
-        self._move_dict_key(st, 'package_data', pyp_dct, 'tool.setuptools.package-data')
+        #
+
+        # TODO: default
+        # find_packages = {
+        #     'include': [Project.name, f'{Project.name}.*'],
+        #     'exclude': [*SetuptoolsBase.find_packages['exclude']],
+        # }
+
+        fp = dict(st.pop('find_packages', {}))
+
+        pyp_dct['tool.setuptools.packages.find'] = fp
+
+        #
+
+        # TODO: default
+        # package_data = {
+        #     '*': [
+        #         '*.c',
+        #         '*.cc',
+        #         '*.h',
+        #         '.manifests.json',
+        #         'LICENSE',
+        #     ],
+        # }
+
+        pd = dict(st.pop('package_data', {}))
+        epd = dict(st.pop('exclude_package_data', {}))
+
+        cpd = self._collect_pkg_data()
+        if cpd.inc:
+            pd['*'] = [*pd.get('*', []), *sorted(set(cpd.inc))]
+        if cpd.exc:
+            epd['*'] = [*epd.get('*', []), *sorted(set(cpd.exc))]
+
+        if pd:
+            pyp_dct['tool.setuptools.package-data'] = pd
+        if epd:
+            pyp_dct['tool.setuptools.exclude-package-data'] = epd
+
+        #
+
+        # TODO: default
+        # manifest_in = [
+        #     'global-exclude **/conftest.py',
+        # ]
 
         mani_in = st.pop('manifest_in', None)
 
@@ -354,7 +426,7 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
         #
 
-        st = specs.setuptools
+        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
         for k in [

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/revisions.py

@@ -9,45 +9,22 @@ TODO:
 import argparse
 import io
 import os.path
-import subprocess
 import tarfile
 import typing as ta
 import zipfile
 
 from omlish.lite.cached import cached_nullary
+from omlish.lite.check import check_non_empty_str
 from omlish.lite.logs import configure_standard_logging
 from omlish.lite.logs import log
 
+from .git import get_git_revision
 from .wheelfile import WheelFile
 
 
 ##
 
 
-def get_git_revision() -> str:
-    has_untracked = bool(subprocess.check_output([
-        'git',
-        'ls-files',
-        '.',
-        '--exclude-standard',
-        '--others',
-    ]).decode().strip())
-
-    dirty_rev = subprocess.check_output([
-        'git',
-        'describe',
-        '--match=NeVeRmAtCh',
-        '--always',
-        '--abbrev=40',
-        '--dirty',
-    ]).decode().strip()
-
-    return dirty_rev + ('-untracked' if has_untracked else '')
-
-
-##
-
-
 class GitRevisionAdder:
     def __init__(
             self,
@@ -62,7 +39,7 @@ class GitRevisionAdder:
     def revision(self) -> str:
         if self._given_revision is not None:
             return self._given_revision
-        return get_git_revision()
+        return check_non_empty_str(get_git_revision())
 
     REVISION_ATTR = '__revision__'
 

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/scripts/interp.py

@@ -515,6 +515,12 @@ def check_not(v: ta.Any) -> None:
     return v
 
 
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev/scripts/pyproject.py

@@ -170,6 +170,105 @@ def find_magic(
                 yield out
 
 
+########################################
+# ../../git.py
+
+
+def git_clone_subtree(
+        *,
+        base_dir: str,
+        repo_url: str,
+        repo_dir: str,
+        branch: ta.Optional[str] = None,
+        rev: ta.Optional[str] = None,
+        repo_subtrees: ta.Sequence[str],
+) -> None:
+    if not bool(branch) ^ bool(rev):
+        raise ValueError('must set branch or rev')
+
+    if isinstance(repo_subtrees, str):
+        raise TypeError(repo_subtrees)
+
+    git_opts = [
+        '-c', 'advice.detachedHead=false',
+    ]
+
+    subprocess.check_call(
+        [
+            'git',
+            *git_opts,
+            'clone',
+            '-n',
+            '--depth=1',
+            '--filter=tree:0',
+            *(['-b', branch] if branch else []),
+            '--single-branch',
+            repo_url,
+            repo_dir,
+        ],
+        cwd=base_dir,
+    )
+
+    rd = os.path.join(base_dir, repo_dir)
+    subprocess.check_call(
+        [
+            'git',
+            *git_opts,
+            'sparse-checkout',
+            'set',
+            '--no-cone',
+            *repo_subtrees,
+        ],
+        cwd=rd,
+    )
+
+    subprocess.check_call(
+        [
+            'git',
+            *git_opts,
+            'checkout',
+            *([rev] if rev else []),
+        ],
+        cwd=rd,
+    )
+
+
+def get_git_revision(
+        *,
+        cwd: ta.Optional[str] = None,
+) -> ta.Optional[str]:
+    subprocess.check_output(['git', '--version'])
+
+    if cwd is None:
+        cwd = os.getcwd()
+
+    if subprocess.run([  # noqa
+        'git',
+        'rev-parse',
+        '--is-inside-work-tree',
+    ], stderr=subprocess.PIPE).returncode:
+        return None
+
+    has_untracked = bool(subprocess.check_output([
+        'git',
+        'ls-files',
+        '.',
+        '--exclude-standard',
+        '--others',
+    ], cwd=cwd).decode().strip())
+
+    dirty_rev = subprocess.check_output([
+        'git',
+        'describe',
+        '--match=NeVeRmAtCh',
+        '--always',
+        '--abbrev=40',
+        '--dirty',
+    ], cwd=cwd).decode().strip()
+
+    return dirty_rev + ('-untracked' if has_untracked else '')
+
+
 ########################################
 # ../../toml/parser.py
 # SPDX-License-Identifier: MIT
@@ -1788,6 +1887,12 @@ def check_not(v: ta.Any) -> None:
     return v
 
 
+def check_non_empty_str(v: ta.Optional[str]) -> str:
+    if not v:
+        raise ValueError
+    return v
+
+
 ########################################
 # ../../../omlish/lite/json.py
 
@@ -3268,30 +3373,6 @@ TODO:
 ##
 
 
-def get_git_revision() -> str:
-    has_untracked = bool(subprocess.check_output([
-        'git',
-        'ls-files',
-        '.',
-        '--exclude-standard',
-        '--others',
-    ]).decode().strip())
-
-    dirty_rev = subprocess.check_output([
-        'git',
-        'describe',
-        '--match=NeVeRmAtCh',
-        '--always',
-        '--abbrev=40',
-        '--dirty',
-    ]).decode().strip()
-
-    return dirty_rev + ('-untracked' if has_untracked else '')
-
-
-##
-
-
 class GitRevisionAdder:
     def __init__(
             self,
@@ -3306,7 +3387,7 @@ class GitRevisionAdder:
     def revision(self) -> str:
         if self._given_revision is not None:
             return self._given_revision
-        return get_git_revision()
+        return check_non_empty_str(get_git_revision())
 
     REVISION_ATTR = '__revision__'
 
@@ -3726,6 +3807,35 @@ class BasePyprojectPackageGenerator(abc.ABC):
 
     #
 
+    class _PkgData(ta.NamedTuple):
+        inc: ta.List[str]
+        exc: ta.List[str]
+
+    @cached_nullary
+    def _collect_pkg_data(self) -> _PkgData:
+        inc: ta.List[str] = []
+        exc: ta.List[str] = []
+
+        for p, ds, fs in os.walk(self._dir_name):  # noqa
+            for f in fs:
+                if f != '.pkgdata':
+                    continue
+                rp = os.path.relpath(p, self._dir_name)
+                log.info('Found pkgdata %s for pkg %s', rp, self._dir_name)
+                with open(os.path.join(p, f)) as fo:
+                    src = fo.read()
+                for l in src.splitlines():
+                    if not (l := l.strip()):
+                        continue
+                    if l.startswith('!'):
+                        exc.append(os.path.join(rp, l[1:]))
+                    else:
+                        inc.append(os.path.join(rp, l))
+
+        return self._PkgData(inc, exc)
+
+    #
+
     @abc.abstractmethod
     def _write_file_contents(self) -> None:
         raise NotImplementedError
@@ -3855,13 +3965,56 @@ class PyprojectPackageGenerator(BasePyprojectPackageGenerator):
 
         #
 
-        st = specs.setuptools
+        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
         st.pop('cexts', None)
 
-        self._move_dict_key(st, 'find_packages', pyp_dct, 'tool.setuptools.packages.find')
-        self._move_dict_key(st, 'package_data', pyp_dct, 'tool.setuptools.package-data')
+        #
+
+        # TODO: default
+        # find_packages = {
+        #     'include': [Project.name, f'{Project.name}.*'],
+        #     'exclude': [*SetuptoolsBase.find_packages['exclude']],
+        # }
+
+        fp = dict(st.pop('find_packages', {}))
+
+        pyp_dct['tool.setuptools.packages.find'] = fp
+
+        #
+
+        # TODO: default
+        # package_data = {
+        #     '*': [
+        #         '*.c',
+        #         '*.cc',
+        #         '*.h',
+        #         '.manifests.json',
+        #         'LICENSE',
+        #     ],
+        # }
+
+        pd = dict(st.pop('package_data', {}))
+        epd = dict(st.pop('exclude_package_data', {}))
+
+        cpd = self._collect_pkg_data()
+        if cpd.inc:
+            pd['*'] = [*pd.get('*', []), *sorted(set(cpd.inc))]
+        if cpd.exc:
+            epd['*'] = [*epd.get('*', []), *sorted(set(cpd.exc))]
+
+        if pd:
+            pyp_dct['tool.setuptools.package-data'] = pd
+        if epd:
+            pyp_dct['tool.setuptools.exclude-package-data'] = epd
+
+        #
+
+        # TODO: default
+        # manifest_in = [
+        #     'global-exclude **/conftest.py',
+        # ]
 
         mani_in = st.pop('manifest_in', None)
 
@@ -3941,7 +4094,7 @@ class _PyprojectCextPackageGenerator(BasePyprojectPackageGenerator):
 
         #
 
-        st = specs.setuptools
+        st = dict(specs.setuptools)
         pyp_dct['tool.setuptools'] = st
 
         for k in [

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omdev
-Version: 0.0.0.dev26
+Version: 0.0.0.dev27
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev26
+Requires-Dist: omlish==0.0.0.dev27
 Provides-Extra: all
 Requires-Dist: pycparser~=2.22; extra == "all"
 Requires-Dist: cffi~=1.17; extra == "all"

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev.egg-info/SOURCES.txt

@@ -2,9 +2,9 @@ LICENSE
 MANIFEST.in
 README.rst
 pyproject.toml
+omdev/.manifests.json
 omdev/__about__.py
 omdev/__init__.py
-omdev/_manifests.json
 omdev/bracepy.py
 omdev/classdot.py
 omdev/cmake.py
@@ -47,9 +47,10 @@ omdev/cexts/_distutils/compilers/ccompiler.py
 omdev/cexts/_distutils/compilers/options.py
 omdev/cexts/_distutils/compilers/unixccompiler.py
 omdev/datacache/__init__.py
+omdev/datacache/actions.py
 omdev/datacache/cache.py
 omdev/datacache/consts.py
-omdev/datacache/default.py
+omdev/datacache/defaults.py
 omdev/datacache/manifests.py
 omdev/datacache/specs.py
 omdev/interp/__init__.py

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev26
+omlish==0.0.0.dev27
 
 [all]
 pycparser~=2.22

{omdev-0.0.0.dev26 → omdev-0.0.0.dev27}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev26'
+version = '0.0.0.dev27'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev26',
+    'omlish == 0.0.0.dev27',
 ]
 
 [project.optional-dependencies]
@@ -69,8 +69,8 @@ exclude = [
 '*' = [
     '*.c',
     '*.cc',
+    '*.cu',
     '*.h',
-    '*.json',
-    '*.sql',
+    '.manifests.json',
     'LICENSE',
 ]

omdev-0.0.0.dev26/omdev/datacache/consts.py

@@ -1 +0,0 @@
-MARSHAL_VERSION = 0

omdev-0.0.0.dev26/omdev/datacache/default.py

@@ -1,51 +0,0 @@
-import os.path
-
-from omlish import lang
-
-from .cache import DataCache
-
-
-##
-
-
-@lang.cached_function(lock=True)
-def default_dir() -> str:
-    return os.path.expanduser('~/.cache/omlish/data')
-
-
-@lang.cached_function(lock=True)
-def default() -> DataCache:
-    return DataCache(default_dir())
-
-
-def _main() -> None:
-    from omlish import logs
-
-    logs.configure_standard_logging('INFO')
-
-    #
-
-    from .specs import GitCacheDataSpec
-    from .specs import GithubContentCacheDataSpec
-    from .specs import HttpCacheDataSpec
-
-    for spec in [
-        GitCacheDataSpec(
-            'https://github.com/wrmsr/deep_learning_cookbook',
-            rev='138a99b09ffa3a728d261e461440f029e512ac93',
-            subtrees=['data/wp_movies_10k.ndjson'],
-        ),
-        GithubContentCacheDataSpec(
-            'karpathy/char-rnn',
-            'master',
-            ['data/tinyshakespeare/input.txt'],
-        ),
-        HttpCacheDataSpec('https://github.com/VanushVaswani/keras_mnistm/releases/download/1.0/keras_mnistm.pkl.gz'),
-    ]:
-        print(spec)
-        for _ in range(2):
-            print(default().get(spec))
-
-
-if __name__ == '__main__':
-    _main()