Merge c40c754 into release

.github/workflows/_code_quality.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install dependencies
         run: pip install -r requirements.txt
       - name: Install ruff
-        run: pip install ruff==0.3.0
+        run: pip install ruff==0.4.2
       - name: Run ruff format
         run: ruff format --diff .
 
@@ -31,24 +31,7 @@ jobs:
       - name: Install dependencies
         run: pip install -r requirements.txt
       - name: Install ruff
-        run: pip install ruff==0.3.0
+        run: pip install ruff==0.4.2
       - name: Run ruff check
         run: ruff check --diff .
 
-  pyright:
-    runs-on: ubuntu-latest
-    name: pyright
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v4
-        with:
-          python-version: '3.11'
-          cache: 'pip' # cache pip dependencies
-      - name: Install dependencies
-        run: |
-          pip install -r requirements.txt
-          pip install pytest
-      - name: Install pyright
-        run: pip install pyright==1.1.352
-      - name: Run pyright
-        run: pyright .

.github/workflows/publish_release.yml

@@ -10,13 +10,21 @@ jobs:
   build_package:
     uses: ./.github/workflows/_build_package.yml
   publish_package:
+    name: Publish package
     needs:
       - build_package
-    uses: ./.github/workflows/_publish_package.yml
-  # publish_package_test:
-  #   needs:
-  #     - build_package
-  #   uses: ./.github/workflows/_publish_package_test.yml
+    runs-on: ubuntu-latest
+    environment: release
+    permissions:
+      id-token: write
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: artifact
+          path: dist
+      - uses: pypa/gh-action-pypi-publish@release/v1
+        # with:                                             # Uncomment this line to publish to testpypi
+        #   repository-url: https://test.pypi.org/legacy/   # Uncomment this line to publish to testpypi
   merge_into_release:
     uses: ./.github/workflows/_merge_into_release.yml
     secrets:

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "python.terminal.activateEnvInCurrentTerminal": true,
     "python.languageServer": "Pylance",
     "editor.formatOnSave": true,
     "notebook.formatOnSave.enabled": true,
@@ -28,4 +27,6 @@
     "python.analysis.inlayHints.functionReturnTypes": false,
     "python.analysis.inlayHints.pytestParameters": true,
     "python.terminal.executeInFileDir": true,
-}
+    "python.terminal.activateEnvironment": true,
+    "python.terminal.activateEnvInCurrentTerminal": false,
+}

CHANGELOG.md

@@ -3,12 +3,17 @@
 All notable changes to the [maritime-schema] project will be documented in this file.<br>
 The changelog format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [Unreleased]
+## [0.0.7] - 2025-02-17
+ - Final Release. This project has merged with ship-traffic-gen
+
+### Changed
+-   VS Code settings: Turned off automatic venv activation
+-   replaced black formatter with ruff formatter
+-   src/maritime_schema/types/caga.py: Allow own_ship and target_ships to take a Ship object as input
 
 ## [0.0.6] - 2024-04-04
 
 ### Changed
-
 -   Updated README.md with a getting started section.
 -   examples: Added examples using `types.caga` classes in the examples folder.
 -   src/maritime_schema/types/caga.py: A number of classes were changed from optional to required.