simple-build-dgcode 0.0.12__tar.gz → 0.0.14__tar.gz

{simple-build-dgcode-0.0.12/src/simple_build_dgcode.egg-info → simple-build-dgcode-0.0.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 0.0.12
+Version: 0.0.14
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for
@@ -218,7 +218,7 @@ Classifier: Operating System :: Unix
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: simple-build-system>=0.0.37
+Requires-Dist: simple-build-system>=0.0.39
 Provides-Extra: recommended
 Requires-Dist: numpy; extra == "recommended"
 Requires-Dist: ncrystal; extra == "recommended"

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14}/pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
     "Operating System :: Unix",
 ]
 dependencies = [
-    'simple-build-system >= 0.0.37'
+    'simple-build-system >= 0.0.39'
 ]
 
 [project.optional-dependencies]

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14/src/simple_build_dgcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 0.0.12
+Version: 0.0.14
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for
@@ -218,7 +218,7 @@ Classifier: Operating System :: Unix
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: simple-build-system>=0.0.37
+Requires-Dist: simple-build-system>=0.0.39
 Provides-Extra: recommended
 Requires-Dist: numpy; extra == "recommended"
 Requires-Dist: ncrystal; extra == "recommended"

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14}/src/simple_build_dgcode.egg-info/SOURCES.txt

@@ -15,6 +15,8 @@ src/simplebuild_dgcode/_utils.py
 src/simplebuild_dgcode/newsimproject.py
 src/simplebuild_dgcode/simplebuild_bundle_list.py
 src/simplebuild_dgcode/data/pkgs/simplebuild.cfg
+src/simplebuild_dgcode/data/pkgs/DGCodeRecommended/pkg.info
+src/simplebuild_dgcode/data/pkgs/DGCodeRecommendedNoGUI/pkg.info
 src/simplebuild_dgcode/data/pkgs/DevTools/pkg.info
 src/simplebuild_dgcode/data/pkgs/DevTools/data/valgrind_suppressions.txt
 src/simplebuild_dgcode/data/pkgs/DevTools/data/valgrind_suppressions_root.txt

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14}/src/simple_build_dgcode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-simple-build-system>=0.0.37
+simple-build-system>=0.0.39
 
 [all]
 numpy

simple-build-dgcode-0.0.14/src/simplebuild_dgcode/data/pkgs/DGCodeRecommended/pkg.info

@@ -0,0 +1,8 @@
+package( USEPKG DGCodeRecommendedNoGUI G4OSG USEEXT matplotlib )
+
+######################################################################
+
+Meta-package which can be used to verify that all essential parts of dgcode is
+enabled.
+
+Primary author: thomas.kittelmann@ess.eu

simple-build-dgcode-0.0.14/src/simplebuild_dgcode/data/pkgs/DGCodeRecommendedNoGUI/pkg.info

@@ -0,0 +1,8 @@
+package( USEPKG G4Launcher G4CollectFilters G4CustomPyGen G4GeantinoInserter G4GravityHelper G4GriffGen G4StdGenerators G4StdGeometries G4StepLimitHelper SimpleHists GriffFormat GriffDataRead G4DataCollect MCPL G4Materials USEEXT Numpy Geant4 ZLib NCrystal )
+
+######################################################################
+
+Meta-package which can be used to verify that all essential non-GUI parts of
+dgcode is enabled.
+
+Primary author: thomas.kittelmann@ess.eu

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14}/src/simplebuild_dgcode/data/pkgs/Utils/XSectUtils/XSectParse/python/PlotXSectFile.py

@@ -1,10 +1,7 @@
 import XSectParse.ParseXSectFile
 from Utils.NeutronMath import neutron_eV_to_angstrom
-import PyAna
-np = PyAna.np
-numpy = PyAna.numpy
-Units = PyAna.Units
-plt = PyAna.plt
+import numpy as np
+import Units
 
 def _find_nearest(array,value):
     idx = (np.abs(array-value)).argmin()
@@ -32,6 +29,7 @@ def _extract_vals(npa,wl,mfp):
         return energy_ev,yvals
 
 def _plot_begin():
+    from PyAna import plt
     #from Core.System import which
     #if which('latex'):
     #    plt.enable_tex_fonts()
@@ -39,6 +37,7 @@ def _plot_begin():
     plt.clf()
 
 def _plot_end(show,save_fig,wl,mfp,logx,logy,extra=None,mfpunit='cm',softbrackets=False):
+    from PyAna import plt
     if extra:
         extra()
     xl = 'Neutron wavelength [Å]' if wl else 'Energy [eV]'
@@ -89,6 +88,8 @@ def plot_file( filename,
     'show' controls display of interactive window (default is to show when no
     saving a figure)"""
 
+    from PyAna import plt
+
     _plot_begin()
     showMFP=mfp
     colors_nored = ['c', 'm', 'y','k','g','b']
@@ -114,7 +115,7 @@ def plot_file( filename,
         procnames+=['Total']
 
     for iprocname,procname in enumerate(procnames):
-        npa=numpy.asarray(procs[procname])
+        npa=np.asarray(procs[procname])
         if not len(npa):#could be an empty physics list
             continue
         xvals,yvals = _extract_vals(npa,versus_wavelength,showMFP)
@@ -145,6 +146,7 @@ def plot_file_cmp(filenames,mfp=False,save_fig=None,show=None,
     be used to customise the label generator. Set extra to a function object to
     invoke to plot custom curves."""
 
+    from PyAna import plt
     _plot_begin()
     showMFP=mfp
 
@@ -158,7 +160,7 @@ def plot_file_cmp(filenames,mfp=False,save_fig=None,show=None,
     pp=[XSectParse.ParseXSectFile.parse(filename) for filename in filenames]
 
     for ifile,p in enumerate(pp):
-        npa=numpy.asarray(p['procs'][xsectname])
+        npa=np.asarray(p['procs'][xsectname])
         if not len(npa):#could be an empty physics list
             continue
         xvals,yvals = _extract_vals(npa,versus_wavelength,showMFP)

{simple-build-dgcode-0.0.12 → simple-build-dgcode-0.0.14}/src/simplebuild_dgcode/data/pkgs_val/UnitTests/MCPLPyTests/scripts/testpyc

@@ -18,7 +18,9 @@ import os
 import glob
 import sys
 import shutil
+import contextlib
 from io import open#py2's open is now like py3's.
+from Utils.printnumpy import format_numpy_1darray_asfloat as npfmt
 
 os.mkdir('./fakepypath')
 with open('./fakepypath/numpy.py','tw') as f:
@@ -30,12 +32,12 @@ try:
     import MCPL as mcpl
 except ImportError as e:
     print("Caught expected error: %s"%str(e))
+    mcpl = None
 shutil.rmtree('./fakepypath')
 sys.path = oldsyspath
 
-import MCPL as mcpl
-
-from Utils.printnumpy import format_numpy_1darray_asfloat as npfmt
+if mcpl is None:
+    import MCPL as mcpl #noqa E402
 
 #import Core.System as Sys
 
@@ -97,7 +99,7 @@ testtool([quote(os.path.join(datadir,'MCPLTests/reffile_truncated.mcpl'))])
 testtool([quote(os.path.join(datadir,'MCPLTests/reffile_truncated.mcpl.gz'))])
 testtool([quote(os.path.join(datadir,'MCPLTests/reffile_encodings.mcpl.gz')),'-basciidata'])
 testtool([quote(os.path.join(datadir,'MCPLTests/reffile_encodings.mcpl.gz')),'-butf8data'])
-import contextlib
+
 @contextlib.contextmanager
 def stdout_buffer_write_hexvalues():
     #Hack needed to prevent the nasty stuff inside the "binarydata" blob cause
@@ -141,7 +143,7 @@ loadbad(None)
 for bf in badfiles:
     loadbad(bf)
 
-from numpy import asarray as np_asarray
+from numpy import asarray as np_asarray # noqa E402
 
 for fn in (file1,file2,file3):
     print ("---> testing array access")
@@ -172,25 +174,40 @@ with mcpl.MCPLFile(file1,blocklength=3) as f:
         print('indices in block starting at %i a: %s'%(pb.file_offset,','.join(   str(pb[i].file_index) for i in range(len(pb)))))
         print('indices in block starting at %i b: %s'%(pb.file_offset,','.join(   str(p.file_index) for p in pb.particles)))
     f.rewind()
-    p=f.read();assert p.file_index==0
-    f.skip_forward(1);p=f.read(); assert p.file_index==2
-    f.skip_forward(1);p=f.read(); assert p.file_index==4
-    f.rewind();f.skip_forward(4);p=f.read(); assert p.file_index==4
+    p=f.read()
+    assert p.file_index==0
+    f.skip_forward(1)
+    p=f.read()
+    assert p.file_index==2
+    f.skip_forward(1)
+    p=f.read()
+    assert p.file_index==4
+    f.rewind()
+    f.skip_forward(4)
+    p=f.read()
+    assert p.file_index==4
     try:
-        f.skip_forward(-1);p=f.read()
+        f.skip_forward(-1)
+        p=f.read()
     except mcpl.MCPLError as e:
         print(str(e))
-    f.skip_forward(999999);p=f.read(); assert p is None
+    f.skip_forward(999999)
+    p=f.read()
+    assert p is None
 
 def tostr(a):
     """convert bytes/unicode to str in both py2 or py3 (assuming ascii chars
     only). Other objects are simply converted via str(..)."""
     #the amount of bullshit we have to deal with in order to support both py2
     #and py3 is rather wild...
-    if isinstance(a,str): return a#bytes in py2, unicode in py3
-    elif isinstance(a,bytes): return a.decode('ascii')#got bytes in py3
-    elif str==bytes and isinstance(a,unicode): return a.encode('ascii')#got unicode in py2 # noqa f821
-    else: return str(a)#neither str/bytes/unicode
+    if isinstance(a,str):
+        return a#bytes in py2, unicode in py3
+    elif isinstance(a,bytes):
+        return a.decode('ascii')#got bytes in py3
+    elif str==bytes and isinstance(a,unicode): #noqa F821 ("unicode" not in py3)
+        return a.encode('ascii')#got unicode in py2 # noqa f821
+    else:
+        return str(a)#neither str/bytes/unicode
 
 def test_stats(*args,**kwargs):
     def fmtkw(k,v):