Merge pull request Open-MSS#2926 from Open-MSS/merge_stable_to_develop

Merge stable to develop

Author: ReimarBauer

.github/workflows/build_docs_gallery.yml

@@ -7,8 +7,8 @@ jobs:
   Test-MSS-docs:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
-    - uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293 # v0.9.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
         cache: true

.github/workflows/lint.yml

@@ -17,8 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
-    - uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293 # v0.9.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
         cache: true
@@ -30,8 +30,8 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
-    - uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293 # v0.9.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
         cache: true
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
     - name: Check for CRLF in the repository
       run: |
         files_with_crlf="$(git ls-files --eol | awk '$1 ~ "crlf"')"
@@ -54,7 +54,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
     - name: Check for whitespace issues in the repository
       # The two example.txt files need to be excluded because whitespace at EOL is part
       # of their format and they fail to parse otherwise.
@@ -72,7 +72,7 @@ jobs:
   ensure-sha-pinned-actions:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
       - name: Ensure SHA pinned actions
         uses: zgosalvez/github-actions-ensure-sha-pinned-actions@fc87bb5b5a97953d987372e74478de634726b3e5 # v3
         with:

.github/workflows/testing-all-oses.yml

@@ -20,8 +20,8 @@ jobs:
       matrix:
         os: ["macos-13", "macos-14", "ubuntu-latest"]
     steps:
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
-    - uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293 # v0.9.0
+    - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
+    - uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
       with:
         pixi-version: latest
         cache: true
@@ -31,7 +31,7 @@ jobs:
       run: pixi run -e dev env QT_QPA_PLATFORM=offscreen pytest -v -n logical --durations=20 --cov=mslib tests
     - run: pixi run -e dev coverage xml
     - name: Send coverage to Coveralls (parallel)
-      uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+      uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
       with:
         debug: true
         parallel: true
@@ -44,6 +44,6 @@ jobs:
     if: ${{ always() }}
     steps:
       - name: Close parallel build
-        uses: coverallsapp/github-action@648a8eb78e6d50909eff900e4ec85cab4524a45b # v2.3.6
+        uses: coverallsapp/github-action@5cbfd81b66ca5d10c19b062c04de0199c215fb6e # v2.3.7
         with:
           parallel-finished: true

.github/workflows/update-pixi-lockfile.yml

@@ -15,11 +15,11 @@ jobs:
       matrix:
         base_branch: ["develop", "stable"]
     steps:
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v4
+      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v4
         with:
           ref: ${{ matrix.base_branch }}
       - name: Generate new lockfile
-        uses: prefix-dev/setup-pixi@fef5c9568ca6c4ff7707bf840ab0692ba3f08293 # v0.9.0
+        uses: prefix-dev/setup-pixi@82d477f15f3a381dbcc8adc1206ce643fe110fb7 # v0.9.3
         with:
           pixi-version: latest
           run-install: false
@@ -28,7 +28,7 @@ jobs:
           set -o pipefail
           pixi update --json | pixi exec pixi-diff-to-markdown >> diff.md
       - name: Create or update pull request
-        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7
+        uses: peter-evans/create-pull-request@84ae59a2cdc2258d6fa0732dd66352dddae2a412 # v7
         with:
           token: ${{ secrets.PAT }}
           branch: automation/update-pixi-lockfile/${{ matrix.base_branch }}

CHANGES.rst

@@ -1,6 +1,16 @@
 Changelog
 =========
 
+Version 10.2.0
+~~~~~~~~~~~~~~
+
+Bug fix release and minor enhancements:
+We've modernized our project build process by switching from `setup.py` to `pyproject.toml`. This eliminates dependencies on the `past` and `future` packages.
+When you launch msui from the command line, the location of the log file will be displayed.
+
+All changes:
+https://github.com/Open-MSS/MSS/milestone/113?closed=1
+
 
 Version 10.1.0
 ~~~~~~~~~~~~~~

docs/conf.py

@@ -17,8 +17,10 @@
 import requests
 import zipfile
 import shutil
-from pathlib import Path
-import toml
+import importlib
+
+
+__version__ = importlib.metadata.version("open-mss")
 
 
 def get_tutorial_images():
@@ -78,7 +80,6 @@ def get_tutorial_images():
 
     import mslib.mswms.wms
     import mslib.mswms.gallery_builder
-    import importlib
 
     # Generate template plots
     from docs.gallery.plot_examples import HS_template, VS_template
@@ -95,8 +96,6 @@ 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")
 
-with open("../pyproject.toml") as f:
-    __version__ = toml.load(f)["project"]["version"]
 
 on_rtd = os.environ.get('READTHEDOCS') == 'True'
 

docs/environment.yml

@@ -2,6 +2,8 @@ name: rtd
 channels:
   - conda-forge
 dependencies:
+  - python
+  - setuptools <81
   - pip
   - pip:
       - flask
@@ -12,15 +14,17 @@ dependencies:
       - scipy
       - metpy
       - markdown
-      - xstatic
+      - xstatic>=1.0.3
+      - xstatic-jquery
+      - xstatic-bootstrap
       - defusedxml
       - sphinx_rtd_theme
       - sphinxcontrib-video>=0.2.1
       - sphinx
       - netCDF4
       - PyQt5
       - owslib
-      - future
+      - ../
+
   - basemap >=1.3.3
   - pint
-  - python <3.12

pixi.lock

@@ -64,7 +64,7 @@ unicodecsv = "*"
 validate_email = "*"
 websocket-client = "*"
 werkzeug = ">=2.2.3, <3.0.0"
-xstatic = "*"
+xstatic = "<2.0.0"
 xstatic-bootstrap = "*"
 xstatic-jquery = "*"
 humanfriendly = ">=10.0,<11"

pixi.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-mss"
-version = "10.1.0"
+version = "10.2.0"
 description = "MSS - Mission Support System"
 readme = "README.md"
 classifiers = [
@@ -30,11 +30,11 @@ mswms = "mslib.mswms.mswms:main"
 msui = "mslib.msui.msui:main"
 
 [build-system]
-requires = ["setuptools >= 40.8.0"]
+requires = ["setuptools >= 61.0"]
 build-backend = "setuptools.build_meta"
 
-[tool.setuptools]
-packages = ["mslib"]
+[tool.setuptools.packages.find]
+include = ["mslib*"]
 
 [tool.codespell]
 exclude-file = "codespell-ignored-lines.txt"