Merge pull request #2870 from Open-MSS/merge_stable_to_develop

Author: ReimarBauer

docs/conf.py

@@ -18,6 +18,7 @@
 import zipfile
 import shutil
 from pathlib import Path
+import toml
 
 
 def get_tutorial_images():
@@ -94,9 +95,8 @@ def get_tutorial_images():
     mslib.mswms.wms.server.generate_gallery(sphinx=True, generate_code=True, all_plots=True, levels="3,4,200,300",
                                             vtimes="2012-10-18T00:00:00,2012-10-19T00:00:00")
 
-version = {}
-exec(Path("../mslib/version.py").read_text(), version)
-__version__ = version["__version__"]
+with open("../pyproject.toml") as f:
+    __version__ = toml.load(f)["project"]["version"]
 
 on_rtd = os.environ.get('READTHEDOCS') == 'True'
 

mslib/__init__.py

@@ -25,6 +25,6 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 """
+import importlib.metadata
 
-
-from .version import __version__  # noqa
+__version__ = importlib.metadata.version("open-mss")

mslib/msidp/idp.py

@@ -1092,6 +1092,9 @@ def main():
         '\033[91mWARNING: msidp is solely for development and '
         'testing purposes; do not use in production environments.\033[0m'
     )
+    if os.name == "nt":
+        logger.error("The msidp application is not usable on Windows.")
+        return 1
     parser = argparse.ArgumentParser()
     parser.add_argument("-p", dest="path", help="Path to configuration file.",
                         default="./idp_conf.py")

mslib/utils/release_info.py

@@ -29,7 +29,7 @@
 import logging
 import requests
 
-from mslib.version import __version__ as installed_version
+from mslib import __version__ as installed_version
 
 
 def get_latest_release():

mslib/version.py

@@ -58,7 +58,7 @@ qt = ">=5.15.0"
 requests = ">=2.31.0"
 scipy = "*"
 skyfield = ">=1.12"
-skyfield-data = ">=6"
+skyfield-data = ">=7"
 tk = "*"
 unicodecsv = "*"
 validate_email = "*"

pixi.lock

@@ -1,6 +1,40 @@
+[project]
+name = "open-mss"
+version = "10.1.0"
+description = "MSS - Mission Support System"
+readme = "README.md"
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+]
+keywords = ["mslib"]
+maintainers = [
+    {name = "Reimar Bauer", email = "rb.proj@gmail.com"},
+]
+authors = [
+    {name = "Marc Rautenhaus", email = "wxmetvis@posteo.de"},
+]
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+
+[project.urls]
+Repository = "https://github.com/Open-MSS/MSS"
+
+[project.scripts]
+mscolab = "mslib.mscolab.mscolab:main"
+msidp = "mslib.msidp.idp:main"
+mssautoplot = "mslib.utils.mssautoplot:main"
+mss = "mslib.msui.mss:main"
+mswms = "mslib.mswms.mswms:main"
+
+[project.gui-scripts]
+msui = "mslib.msui.msui:main"
+
 [build-system]
-requires = ["setuptools >= 40.8.0", "future"]
-build-backend = "setuptools.build_meta:__legacy__"
+requires = ["setuptools >= 40.8.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = ["mslib"]
 
 [tool.codespell]
 exclude-file = "codespell-ignored-lines.txt"

pixi.toml

@@ -29,7 +29,7 @@
 from packaging import version
 
 from mslib.utils import auth
-from mslib.version import __version__
+from mslib import __version__
 from mslib.msui.constants import MSUI_SETTINGS
 from tests.utils import create_msui_settings_file