restage 0.8.3__tar.gz → 0.9.0__tar.gz

{restage-0.8.3/src/restage.egg-info → restage-0.9.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.8.3
+Version: 0.9.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
@@ -17,10 +17,10 @@ Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: confuse
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: mccode-antlr[hdf5]>=0.15.2
+Requires-Dist: mccode-antlr[hdf5]>=0.16.1
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: chopcal; extra == "test"
+Requires-Dist: chopcal>=0.4.0; extra == "test"
 
 # restage
 Semiautomatic two-stage McCode simulations for parameter scans.

{restage-0.8.3 → restage-0.9.0}/pyproject.toml

@@ -9,7 +9,7 @@ dependencies = [
     'platformdirs>=3.11',
     'confuse',
     'psutil>=5.9.6',
-    'mccode-antlr[hdf5]>=0.15.2',
+    'mccode-antlr[hdf5]>=0.16.1',
 ]
 readme = "README.md"
 license = {text = "BSD-3-Clause"}
@@ -30,7 +30,7 @@ classifiers = [
 dynamic = ["version"]
 
 [project.optional-dependencies]
-test = ["pytest", "chopcal"]
+test = ["pytest", "chopcal>=0.4.0"]
 
 [project.scripts]
 splitrun = "restage.splitrun:entrypoint"

{restage-0.8.3 → restage-0.9.0/src/restage.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: restage
-Version: 0.8.3
+Version: 0.9.0
 Author-email: Gregory Tucker <gregory.tucker@ess.eu>
 License: BSD-3-Clause
 Classifier: License :: OSI Approved :: BSD License
@@ -17,10 +17,10 @@ Requires-Dist: zenlog>=1.1
 Requires-Dist: platformdirs>=3.11
 Requires-Dist: confuse
 Requires-Dist: psutil>=5.9.6
-Requires-Dist: mccode-antlr[hdf5]>=0.15.2
+Requires-Dist: mccode-antlr[hdf5]>=0.16.1
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
-Requires-Dist: chopcal; extra == "test"
+Requires-Dist: chopcal>=0.4.0; extra == "test"
 
 # restage
 Semiautomatic two-stage McCode simulations for parameter scans.

{restage-0.8.3 → restage-0.9.0}/src/restage.egg-info/requires.txt

@@ -2,8 +2,8 @@ zenlog>=1.1
 platformdirs>=3.11
 confuse
 psutil>=5.9.6
-mccode-antlr[hdf5]>=0.15.2
+mccode-antlr[hdf5]>=0.16.1
 
 [test]
 pytest
-chopcal
+chopcal>=0.4.0

{restage-0.8.3 → restage-0.9.0}/test/test_energy.py

@@ -137,8 +137,11 @@ class BIFROSTEnergyTestCase(unittest.TestCase):
             kv = {'order': order, 'time': time, 'ei': energy}
             translated = bifrost_translate_energy_to_chopper_parameters(kv)
             from_mcstas = mcstas_bifrost_calculation(energy, 0., time)
-            for o, x in zip(parameters(OLD_CHOPPERS), parameters(CHOPPERS)):
-                self.assertAlmostEqual(from_mcstas[o], translated[x])
+            for o, x in zip(OLD_CHOPPERS, CHOPPERS):
+                # chopcal >= 0.4.0 returns a dictionary of Chopper objects
+                chopper = from_mcstas[o]
+                for prop in ('speed', 'phase'):
+                    self.assertAlmostEqual(getattr(chopper, prop), translated[f'{x}{prop}'])
 
 
 if __name__ == '__main__':