Merge branch 'Open-MSS:develop' into keyring

Author: anj20

docs/development.rst

@@ -226,7 +226,7 @@ This can be used to run tests on an invisible virtual display by prepending the
   $ xvfb-run pytest ...
 
 We have implemented demodata as data base for testing. On first call of pytest a set of demodata becomes stored
-in a /tmp/mss* folder. If you have installed gitpython a postfix of the revision head is added.
+in a /tmp/mss* folder.
 
 
 Setup MSWMS server

localbuild/meta.yaml

@@ -86,6 +86,7 @@ requirements:
     - flask-login
     - pysaml2
     - libxmlsec1  # [not win]
+    - numpy >= 2.0
   run_constrained:
     - menuinst >=2.0.2
 

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 ###

mslib/msui/mpl_pathinteractor.py

@@ -111,7 +111,7 @@ def insert_vertex(self, index, vertex, code):
            matplotlib.Path) at the given index.
         """
         self.vertices = np.insert(self.vertices, index,
-                                  np.asarray(vertex, np.float_), axis=0)
+                                  np.asarray(vertex, np.float64), axis=0)
         self.codes = np.insert(self.codes, index, code, axis=0)
 
     def index_of_closest_segment(self, x, y, eps=5):

mslib/mswms/demodata.py

@@ -1161,7 +1161,7 @@ def generate_file(self, coordinate, label, leveltype, dimvals, variables):
             newvar.units = unit
             newvar[:] = test_data
             newvar.grid_mapping = 'LatLon_Projection'
-            newvar.missing_value = float('nan')
+            newvar.missing_value = np.nan
 
         ecmwf.close()
 

mslib/utils/thermolib.py

@@ -133,7 +133,7 @@ def omega_to_w(omega, p, t):
     (32 * units.km, 228.65 * units.K, 868.019 * units.Pa, -0.0028 * units.K / units.m),
     (47 * units.km, 270.65 * units.K, 110.906 * units.Pa, 0 * units.K / units.m),
     (51 * units.km, 270.65 * units.K, 66.9389 * units.Pa, 0.0028 * units.K / units.m),
-    (71 * units.km, 214.65 * units.K, 3.95642 * units.Pa, float("NaN") * units.K / units.m)
+    (71 * units.km, 214.65 * units.K, 3.95642 * units.Pa, np.nan * units.K / units.m)
 ]
 _HEIGHT, _TEMPERATURE, _PRESSURE, _TEMPERATURE_GRADIENT = 0, 1, 2, 3
 

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("")