ncrystal-python 4.2.0__tar.gz → 4.2.4__tar.gz

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ncrystal-python
-Version: 4.2.0
+Version: 4.2.4
 Summary: Library for thermal neutron transport in crystals and other materials.
 Author: NCrystal developers (Thomas Kittelmann, Xiao Xiao Cai)
 License: 

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/NCrystal/__init__.py

@@ -55,7 +55,7 @@ For detailed usage conditions and licensing of this open source project, see:
 
 #NB: Synchronize meta-data below with fields in setup.py+template_setup.py.in meta data:
 __license__ = "Apache 2.0, http://www.apache.org/licenses/LICENSE-2.0"
-__version__ = '4.2.0'
+__version__ = '4.2.4'
 __status__ = "Production"
 __author__ = "NCrystal developers (Thomas Kittelmann, Xiao Xiao Cai)"
 __copyright__ = "Copyright 2015-2024 %s"%__author__

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/NCrystal/_common.py

@@ -514,3 +514,29 @@ def _lookup_existing_file( path ):
             p = pathlib.Path(dd).joinpath(path)
             if p.exists():
                 return p.absolute()
+
+_override_datetime_now = [ None ]
+def _datetime_now():
+    """Returns datetime.datetime.now() but possibly intercepted for unit tests"""
+    import datetime
+    n = datetime.datetime.now()
+    return _override_datetime_now[0] or n
+
+class FixedFakeDatetimeNow():
+    # Context manager to be used in unit tests to modify the returned value from
+    # the datetime_now function below, to a fixed value.
+    def __enter__(self):
+        import datetime
+        self.__orig = _override_datetime_now[0]
+        _override_datetime_now[0] = datetime.datetime( 2017, 8, 29, 13, 40,
+                                                       tzinfo
+                                                       = datetime.timezone.utc )
+    def __exit__(self,*args,**kwargs):
+        _override_datetime_now[0] = self.__orig
+
+def fixed_fake_datetime_now(f):
+    #To be used as a decorator
+    def fw(*a, **kw):
+        with FixedFakeDatetimeNow():
+            return f(*a, **kw)
+    return fw

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/NCrystal/_ncmat2endf_impl.py

@@ -1060,7 +1060,12 @@ class EndfFile():
 
         if self._parser is None:
             endf_parserpy,_,_ = import_endfparserpy()
-            self._parser = endf_parserpy.EndfParser(
+            if hasattr(endf_parserpy,'EndfParserPy'):
+                EndfParserPy = endf_parserpy.EndfParserPy
+            else:
+                #legacy endf-parserpy 0.13.x support
+                EndfParserPy = endf_parserpy.EndfParser
+            self._parser = EndfParserPy(
                 explain_missing_variable=True,
                 cache_dir=False
             )
@@ -1524,7 +1529,9 @@ def _tidy_beta( x, allow_negative=False):
         assert -1e99 <= x <= 1e99
     else:
         assert 0.0 <= x <= 1e99
-    if x > 8:
+    if x < -120:
+        return float('%.1g'%x)
+    if abs(x) > 8:
         return float('%.2g'%x)
     return float('%.3g'%x)
 

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/NCrystal/_testimpl.py

@@ -46,7 +46,10 @@ def test_all( verbose = False ):
 
 def _get_prfct( verbose ):
     if verbose and verbose != 'quiet':
-        return lambda *a, **kw : _nc_print('::NCrystalTest::',*a,**kw)
+        def prt(  *a, **kw ):
+            kw['flush'] = True
+            return _nc_print('::NCrystalTest::',*a,**kw)
+        return prt
     else:
         return lambda *a, **kw : None
 

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/NCrystal/ncmat2endf.py

@@ -185,12 +185,12 @@ class EndfMetaData():
         (key,value) pairs, or another EndfMetaData object, the associated values
         will be updated accordingly.
         """
-        from datetime import datetime
+        from ._common import _datetime_now
         import copy
         from ._ncmat2endf_impl import _metadata_definitions
         self.__data = dict( (k,copy.deepcopy(v['defval']))
                             for k,v in _metadata_definitions.items() )
-        self.__now_MMMYY = datetime.now().strftime('%b%y').upper()
+        self.__now_MMMYY = _datetime_now().strftime('%b%y').upper()
         if data:
             self.update_from_dict(data)
 

{ncrystal_python-4.2.0 → ncrystal_python-4.2.4}/src/ncrystal_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ncrystal-python
-Version: 4.2.0
+Version: 4.2.4
 Summary: Library for thermal neutron transport in crystals and other materials.
 Author: NCrystal developers (Thomas Kittelmann, Xiao Xiao Cai)
 License: