cdxcore 0.1.9__tar.gz → 0.1.10__tar.gz

{cdxcore-0.1.9 → cdxcore-0.1.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdxcore
-Version: 0.1.9
+Version: 0.1.10
 Summary: Basic Python Tools; upgraded cdxbasics
 Author-email: Hans Buehler <github@buehler.london>
 License-Expression: MIT

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore/__init__.py

@@ -4,4 +4,4 @@ Created on June 2022
 @author: hansb
 """
 
-__version__ = "0.1.9"  # auto-updated by setup.py
+__version__ = "0.1.10"  # auto-updated by setup.py

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore/subdir.py

@@ -339,7 +339,6 @@ Documentation
 -------------
 """
 
-
 import os as os
 import uuid as uuid
 import threading as threading
@@ -355,11 +354,9 @@ from enum import Enum
 from functools import update_wrapper
         
 import json as json
-import jsonpickle as jsonpickle
-import jsonpickle.ext.numpy as jsonpickle_numpy
 import gzip as gzip
 import blosc as blosc
-
+import sys as sys
 from .err import verify, error, warn, fmt as txtfmt
 from .pretty import PrettyObject
 from .verbose import Context
@@ -372,7 +369,16 @@ from .uniquehash import unique_hash48, UniqueLabel, NamedUniqueHash
 :meta private:
 compression
 """
-jsonpickle_numpy.register_handlers()
+
+def _import_jsonpickle():
+    """ For some dodgy reason importing `jsonpickle` normally causes my tests to fail with a recursion error """
+    jsonpickle = sys.modules.get('jsonpickle', None)
+    if jsonpickle is None:
+        import jsonpickle as jsonpickle
+        import jsonpickle.ext.numpy as jsonpickle_numpy
+        jsonpickle_numpy.register_handlers()
+    return jsonpickle
+
 BLOSC_MAX_BLOCK = 2147483631
 BLOSC_MAX_USE   = 1147400000 # ... blosc really cannot handle large files
 #
@@ -1518,6 +1524,7 @@ class SubDir(object):
                             return ok
                         # read
                         if fmt == Format.JSON_PICKLE:
+                            jsonpickle = _import_jsonpickle()
                             return jsonpickle.decode( f.read() )
                         else:
                             assert fmt == Format.JSON_PLAIN, ("Internal error: unknown Format", fmt)
@@ -1935,6 +1942,7 @@ class SubDir(object):
                         if not version is None:
                             f.write("# " + version + "\n")
                         if fmt == Format.JSON_PICKLE:
+                            jsonpickle = _import_jsonpickle()
                             f.write( jsonpickle.encode(obj) )
                         else:
                             assert fmt == Format.JSON_PLAIN, ("Internal error: invalid Format", fmt)

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore/version.py

@@ -498,7 +498,7 @@ class Version(object):
         """
         Compute hash for use with :class:`cdxcore.uniquehash.UniqueHash`.
         """
-        return self.unique_id(max_len=uniqueHash.length)
+        return self.unique_id(max_len=unique_hash.length)
     
 # =======================================================
 # @version

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdxcore
-Version: 0.1.9
+Version: 0.1.10
 Summary: Basic Python Tools; upgraded cdxbasics
 Author-email: Hans Buehler <github@buehler.london>
 License-Expression: MIT

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ cdxcore/__init__.py
 cdxcore/config.py
 cdxcore/crman.py
 cdxcore/err.py
+cdxcore/jcpool.py
 cdxcore/pretty.py
 cdxcore/pretty.py_bak.py
 cdxcore/subdir.py
@@ -17,7 +18,6 @@ cdxcore.egg-info/SOURCES.txt
 cdxcore.egg-info/dependency_links.txt
 cdxcore.egg-info/requires.txt
 cdxcore.egg-info/top_level.txt
-docs2/source/conf.py
 docs/source/conf.py
 tests/test_config.py
 tests/test_crman.py
@@ -31,7 +31,6 @@ tests/test_version.py
 tmp/deferred.py
 tmp/dynaplot.py
 tmp/filelock.py
-tmp/jcpool.py
 tmp/np.py
 tmp/npio.py
 tmp/sharedarray.py

{cdxcore-0.1.9 → cdxcore-0.1.10}/cdxcore.egg-info/top_level.txt

@@ -1,7 +1,6 @@
 cdxcore
 dist
 docs
-docs2
 media
 tests
 tmp

{cdxcore-0.1.9 → cdxcore-0.1.10}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cdxcore"
-version = "0.1.9"
+version = "0.1.10"
 description = "Basic Python Tools; upgraded cdxbasics"
 authors = [{ name = "Hans Buehler", email = "github@buehler.london" }]
 readme = "README.md"

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_config.py

@@ -4,7 +4,6 @@ Created on Tue Apr 14 21:24:52 2020
 @author: hansb
 """
 
-
 import unittest as unittest
 import dataclasses as dataclasses
 import sys as sys
@@ -12,7 +11,6 @@ import os as os
 import pickle as pickle
 import tempfile as tempfile
 import shutil as shutil
-sys.setrecursionlimit(100)
 
 def import_local():
     """
@@ -37,7 +35,7 @@ def import_local():
         if name[:len(me)] == me:
             imp.reload(mdata)
             print("Reloaded", name)
-import_local()
+#import_local()
 
 from cdxcore.config import Config, Int, Float
 from cdxcore.pretty import PrettyObject as pdct

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_crman.py

@@ -29,7 +29,7 @@ def import_local():
         if name[:len(me)] == me:
             imp.reload(mdata)
             print("Reloaded", name)
-import_local()
+#import_local()
 
 from cdxcore.crman import CRMan
 

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_err.py

@@ -30,7 +30,7 @@ def import_local():
         if name[:len(me)] == me:
             imp.reload(mdata)
             print("Reloaded", name)
-import_local()
+#import_local()
 
 from cdxcore.err import fmt, error, verify, warn, warn_if
 

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_pretty.py

@@ -37,7 +37,7 @@ def import_local():
         if name[:len(me)] == me:
             imp.reload(mdata)
             print("Reloaded", name)
-import_local()
+#import_local()
 
 from cdxcore.pretty import PrettyObject, Sequence
 

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_subdir.py

@@ -28,7 +28,7 @@ def import_local():
     for name, mdata in modules.items():
         if name[:len(me)] == me:
             imp.reload(mdata)
-import_local()
+#import_local()
     
 """
 Imports

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_uniquehash.py

@@ -32,7 +32,7 @@ def import_local():
     for name, mdata in modules.items():
         if name[:len(me)] == me:
             imp.reload(mdata)
-import_local()
+#import_local()
     
 """
 Imports

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_util.py

@@ -31,7 +31,7 @@ def import_local():
     for name, mdata in modules.items():
         if name[:len(me)] == me:
             imp.reload(mdata)
-import_local()
+#import_local()
 
 from cdxcore.util import is_function, is_atomic, is_float, is_filename
 from cdxcore.util import fmt, fmt_seconds, fmt_list, fmt_dict, fmt_big_number, fmt_digits, fmt_big_byte_number, fmt_datetime, fmt_date, fmt_time, fmt_timedelta, fmt_filename, DEF_FILE_NAME_MAP

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_verbose.py

@@ -29,7 +29,7 @@ def import_local():
         if name[:len(me)] == me:
             imp.reload(mdata)
             print("Reloaded", name)
-import_local()
+#import_local()
 
 from cdxcore.verbose import Context
 from cdxcore.uniquehash import unique_hash32 as unique_hash

{cdxcore-0.1.9 → cdxcore-0.1.10}/tests/test_version.py

@@ -28,7 +28,7 @@ def import_local():
     for name, mdata in modules.items():
         if name[:len(me)] == me:
             imp.reload(mdata)
-import_local()
+#import_local()
     
 """
 Imports

cdxcore-0.1.9/docs2/source/conf.py

@@ -1,35 +0,0 @@
-# conf.py
-def set_path(source = "cdxcore"):
-    import os, sys
-    root_path = os.path.split(
-                os.path.split(  
-                  os.path.split( __file__ )[0] # 'source
-                  )[0] # 'docs'
-                )[0] # 'packag
-    assert root_path[-len(source):] == source, f"Conf.py '{__file__}': invalid source path '{root_path}'. Call 'make html' from the docs directory"
-    sys.path.insert(0, root_path)  # so your package is importable
-    
-
-project = "cdxcore"
-author = "Hans Buehler"
-release = "0.1.0"
-
-set_path(project)
-
-extensions = [
-    "sphinx.ext.autodoc",           # core: import & docstrings
-    "sphinx.ext.autosummary",       # summary tables with links
-    "sphinx.ext.napoleon",          # Google/NumPy style docstrings
-    "sphinx_autodoc_typehints",     # nicer type hints formatting
-    "sphinx.ext.mathjax",           # math rendering
-]
-
-autosummary_generate = True         # make _autosummary files
-autodoc_typehints = "description"   # show types in doc body instead of signature
-autodoc_member_order = "bysource"   # preserve order in source file
-napoleon_google_docstring = True
-napoleon_numpy_docstring = True
-napoleon_use_param = True
-napoleon_use_rtype = False
-autoclass_content = "both"
-