Merge branch 'rng_entropy-for-tests-in-PRIVATE' into 'development'

rng_entropy for tests in PRIVATE

See merge request damask/DAMASK!1033

Author: eisenlohr

.gitlab-ci.yml

@@ -101,7 +101,7 @@ create_package_min:
     - export DAMASK_ROOT=$(pwd)
     - PYTHONPATH=${DAMASK_ROOT}/python:$PYTHONPATH
     - cd python
-    - python3 -m pytest -v --cov=damask --cov-report=xml --damaskroot=${DAMASK_ROOT}
+    - python3 -m pytest -v --cov=damask --cov-report=xml --damask-root=${DAMASK_ROOT}
     - coverage report --fail-under=90 --show-missing
 
 pytest:

PRIVATE

@@ -1,6 +1,6 @@
 from pathlib import Path
-import datetime
 import os
+import datetime
 
 import numpy as np
 import pytest
@@ -51,44 +51,49 @@ def _None(block=None):
 def pytest_addoption(parser):
     parser.addoption('--update', action='store_true', default=False,
                      help='Update reference results.')
-    parser.addoption('--damaskroot',
+    parser.addoption('--damask-root',default=os.environ.get('DAMASK_ROOT'),
                      help='DAMASK root directory.')
-    parser.addoption('--rng_entropy',
+    parser.addoption('--rng-entropy',
                      help='Entropy for random seed generator.')
 
 @pytest.fixture
-def update(pytestconfig):
-    """Store current results as new reference results."""
-    return pytestconfig.getoption('--update')
+def update(request):
+    """Store current results as new reference data."""
+    return request.config.getoption('--update')
+
+@pytest.fixture
+def damask_root(request):
+    """DAMASK root directory."""
+    if (damask_root := request.config.getoption('--damask-root')) is not None:
+        return Path(damask_root).expanduser()
+    else:
+        return damask_root
 
 @pytest.fixture
-def damaskroot(pytestconfig):
-    """Specify DAMASK root directory."""
-    return pytestconfig.getoption('--damaskroot')
+def np_rng(request):
+    """Instance of numpy.random.Generator."""
+    e = request.config.getoption('--rng-entropy')
+    print('\nrng entropy: ',sq := np.random.SeedSequence(e if e is None else int(e)).entropy)
+    return np.random.default_rng(seed=sq)
 
 # https://stackoverflow.com/questions/51883573
 def pytest_collection_modifyitems(config, items):
-    if config.getoption('--damaskroot') is None:
-        need_damaskroot = pytest.mark.skip(reason='need --damaskroot to run')
+    if config.getoption('--damask-root') is None:
+        need_damask_root = pytest.mark.skip(reason='need --damask-root to run')
         for item in items:
-            if 'need_damaskroot' in item.keywords: item.add_marker(need_damaskroot)
+            if 'need_damask_root' in item.keywords: item.add_marker(need_damask_root)
 
 def pytest_configure(config):
     config.addinivalue_line(
-        'markers', 'need_damaskroot: mark test to run only if DAMASK root is given'
+        'markers', 'need_damask_root: mark test to run only if DAMASK root is given'
     )
 
+
 @pytest.fixture
 def res_path_base():
     """Directory containing testing resources."""
     return Path(__file__).parent/'resources'
 
-@pytest.fixture
-def np_rng(pytestconfig):
-    """Instance of numpy.random.Generator."""
-    e = pytestconfig.getoption('--rng_entropy')
-    print('\nrng entropy: ',sq := np.random.SeedSequence(e if e is None else int(e)).entropy)
-    return np.random.default_rng(seed=sq)
 
 @pytest.fixture
 def set_of_quaternions(np_rng):

python/tests/conftest.py

@@ -171,13 +171,13 @@ def test_related_invalid_target(self,np_rng,crystal):
                                          Crystal(lattice='hP',c=np.sqrt(2.)*.99),
                                          Crystal(lattice='tI',c=1.2)])
     @pytest.mark.parametrize('mode',['slip','twin'])
-    @pytest.mark.need_damaskroot
-    def test_system_match(self,crystal,mode,damaskroot):
+    @pytest.mark.need_damask_root
+    def test_system_match(self,crystal,mode,damask_root):
         if crystal.lattice == 'tI' and mode == 'twin': return
 
         raw = []
         name = f'{crystal.lattice.upper()}_SYSTEM{mode.upper()}'
-        with open(Path(damaskroot).expanduser()/'src'/'crystal.f90') as f:
+        with open(damask_root/'src'/'crystal.f90') as f:
             in_matrix = False
             for line in [l for l in f if l.split('!')[0].strip()]:
                 if f'shape({name})' in line: break