changed jutil repo from jugit to iffgit

.gitlab-ci.yml

@@ -31,7 +31,7 @@ test_miniconda:
     - conda uninstall mayavi vtk -y  # TODO: necessary, because mayavi does not play nice with qt5!
     - conda install pyqt=5  # TODO: This is needed for tests to run, but breaks mayavi (not used)!
     # Install jutil via secure ssh connection:
-    - pip install git+ssh://gitlab@jugit.fz-juelich.de/unger/jutil.git
+    - pip install git+ssh://gitlab@iffgit.fz-juelich.de/unger/jutil.git
     # Execute tests:
     - python setup.py test
     # Create coverage report:
@@ -58,7 +58,7 @@ test_conda_ubuntu:
     - conda uninstall mayavi vtk -y  # TODO: necessary, because mayavi does not play nice with qt5!
     - conda install pyqt=5  # TODO: This is needed for tests to run, but breaks mayavi (not used)!
     # Install jutil via secure ssh connection:
-    - pip install git+ssh://git@jugit.fz-juelich.de:j.ungermann/jutil.git
+    - pip install git+ssh://git@iffgit.fz-juelich.de:j.ungermann/jutil.git
     # Execute tests:
     - python setup.py test
 
@@ -71,7 +71,7 @@ test_pip_minimal:
     # Install requirements:
     - pip install -e .['tests']  # TODO: other case with ['all']? After getting rid of mayavi...
     # Install jutil via secure ssh connection:
-    - pip install git+ssh://git@jugit.fz-juelich.de:j.ungermann/jutil.git
+    - pip install git+ssh://git@iffgit.fz-juelich.de:j.ungermann/jutil.git
     # Execute tests:
     - python setup.py test
 
@@ -82,7 +82,7 @@ test_pip_requirements:
     # Install requirements:
     - pip install -r requirements.txt  # TODO: mayavi/pyfftw commented out by hand to make work!
     # Install jutil via secure ssh connection:
-    - pip install git+ssh://git@jugit.fz-juelich.de:j.ungermann/jutil.git
+    - pip install git+ssh://git@iffgit.fz-juelich.de:j.ungermann/jutil.git
     # Execute tests:
     - python setup.py test
 

pyramid/dataset.py

@@ -214,7 +214,7 @@ class DataSet(object):
         if type(phasemapper) is not list:
             phasemapper = [phasemapper] * len(phasemap)
         assert len(phasemap) == len(projector),\
-            (f'Phasemaps and projectors must have same'
+            ('Phasemaps and projectors must have same'
              + f'length(phasemaps: {len(phasemap)}, projectors: {len(projector)})!')
         for i in range(len(phasemap)):
             self._append_single(phasemap[i], projector[i], phasemapper[i])
@@ -624,8 +624,8 @@ class DataSetCharge(object):
         if type(phasemapper) is not list:
             phasemapper = [phasemapper] * len(phasemap)
         assert len(phasemap) == len(projector), \
-            (f'Phasemaps and projectors must have same length'
-             + '(phasemaps: {len(phasemap)}, projectors: {len(projector)})!')
+            ('Phasemaps and projectors must have same length'
+             + f'(phasemaps: {len(phasemap)}, projectors: {len(projector)})!')
         for i in range(len(phasemap)):
             self._append_single(phasemap[i], projector[i], phasemapper[i])
         # Reset the Se_inv matrix from phasemaps confidence matrices: