Merge branch 'develop' into pixi_prefered_installation

Author: ReimarBauer

docs/development.rst

@@ -162,6 +162,7 @@ After the image was configured you can use it like a self installed env ::
 
 
 
+
 Code Style
 ----------
 

mslib/mscolab/migrations/versions/922e4d9c94e2_to_version_10_0_0.py

@@ -21,13 +21,15 @@ def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.add_column(sa.Column('profile_image_path', sa.String(length=255), nullable=True))
-
+    op.execute("UPDATE changes SET version_name = NULL WHERE version_name = 'None';")
+    op.execute("UPDATE changes SET comment = NULL WHERE comment = 'None';")
     # ### end Alembic commands ###
 
 
 def downgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     with op.batch_alter_table('users', schema=None) as batch_op:
         batch_op.drop_column('profile_image_path')
-
+    op.execute("UPDATE changes SET version_name = 'None' WHERE version_name IS NULL;")
+    op.execute("UPDATE changes SET comment = 'None' WHERE comment IS NULL;")
     # ### end Alembic commands ###

requirements.d/development.txt

@@ -12,7 +12,6 @@ pytest-cov
 sphinx
 sphinx_rtd_theme
 sphinxcontrib-video
-gitpython
 pynco
 conda-verify
 pytest-reverse

tests/constants.py

@@ -28,30 +28,13 @@
 import os
 import fs
 import tempfile
-import logging
 from fs.tempfs import TempFS
 
-try:
-    import git
-except ImportError:
-    SHA = ""
-else:
-    path = os.path.dirname(os.path.realpath(__file__))
-    repo = git.Repo(path, search_parent_directories=True)
-    logging.debug(path)
-    try:
-        # this is for local development important to get a fresh named tmpdir
-        SHA = repo.head.object.hexsha[0:10]
-    except (ValueError, BrokenPipeError) as ex:
-        logging.debug("Unknown Problem: %s", ex)
-        # mounted dir in docker container and owner is not root
-        SHA = ""
-
 CACHED_CONFIG_FILE = None
 SERVER_CONFIG_FILE = "mswms_settings.py"
 MSCOLAB_CONFIG_FILE = "mscolab_settings.py"
 MSCOLAB_AUTH_FILE = "mscolab_auth.py"
-ROOT_FS = TempFS(identifier=f"msui{SHA}")
+ROOT_FS = TempFS(identifier="msui")
 OSFS_URL = ROOT_FS.geturl("", purpose="fs")
 
 ROOT_DIR = ROOT_FS.getsyspath("")