flightanalysis 0.2.9__tar.gz → 0.2.11__tar.gz

flightanalysis-0.2.11/.github/workflows/publish_pypi.yml

@@ -0,0 +1,52 @@
+name: Publish to PyPI and create GH release
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+jobs:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    
+    - name: Set up Python
+      uses: actions/setup-python@v4
+      with:
+        python-version: 3.x
+
+    - name: Install dependencies
+      run: pip install -r requirements.txt
+    
+    - name: Install pypa / build
+      run: python3 -m pip install build --user
+    
+    - name: Build a binary wheel and a source tarball
+      run: python3 -m build
+    
+    - name: Store the distribution packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+  
+  publish-to-pypi:
+    name: Publish Python distribution to PyPI
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/<package-name>
+    permissions:
+      id-token: write  # IMPORTANT: mandatory for trusted publishing
+
+    steps:
+    - name: Download all the dists
+      uses: actions/download-artifact@v3
+      with:
+        name: python-package-distributions
+        path: dist/
+    - name: Publish distribution to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1

{flightanalysis-0.2.9/flightanalysis.egg-info → flightanalysis-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.9
+Version: 0.2.11
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{flightanalysis-0.2.9 → flightanalysis-0.2.11}/flightanalysis/analysis/manoeuvre_analysis/basic.py

@@ -30,8 +30,9 @@ class Basic(Analysis):
                     self = r
 
         if isinstance(self, Scored) and optimise_aligment:
+            self = Complete(**{k:v for k, v in list(self.__dict__.items())[:-1]}).run(True)
             self.stage = AlinmentStage.SECONDARY
-            self = self.run(True)
+            self = self.run_all(True)
                    
         return self
         
@@ -81,4 +82,5 @@ class Basic(Analysis):
 
 
 from .alignment import Alignment  # noqa: E402
+from .complete import Complete  # noqa: E402
 from .scored import Scored  # noqa: E402

{flightanalysis-0.2.9 → flightanalysis-0.2.11}/flightanalysis/analysis/manoeuvre_analysis/complete.py

@@ -4,7 +4,7 @@ from ..el_analysis import ElementAnalysis
 from flightdata import State
 from flightanalysis.definition import ManDef
 from flightanalysis.manoeuvre import Manoeuvre
-from flightanalysis.scoring import Results, Result, ManoeuvreResults, Measurement
+from flightanalysis.scoring import Results, ManoeuvreResults, Measurement
 from flightanalysis.scoring.criteria.f3a_criteria import F3A
 from flightanalysis.definition.maninfo import Position
 import numpy as np

{flightanalysis-0.2.9 → flightanalysis-0.2.11/flightanalysis.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightanalysis
-Version: 0.2.9
+Version: 0.2.11
 Summary: A package for analysing flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3

{flightanalysis-0.2.9 → flightanalysis-0.2.11}/flightanalysis.egg-info/SOURCES.txt

@@ -90,7 +90,6 @@ flightanalysis/scoring/criteria/intra/__init__.py
 flightanalysis/scoring/criteria/intra/bounded.py
 flightanalysis/scoring/criteria/intra/continuous.py
 flightanalysis/scoring/criteria/intra/single.py
-flightanalysis/scripts/__init__.py
 flightanalysis/scripts/batch_analyse.py
 flightanalysis/scripts/collect_scores.py
 scripts/AMA_Intermediate2024.py

flightanalysis-0.2.11/flightanalysis.egg-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+batch_analyse = flightanalysis.scripts.batch_analyse:main
+collect_scores = flightanalysis.scripts.collect_scores:main

{flightanalysis-0.2.9 → flightanalysis-0.2.11}/pyproject.toml

@@ -16,8 +16,8 @@ classifiers = ["Programming Language :: Python :: 3",]
 dynamic = ["version", "dependencies", "optional-dependencies"]
 
 [project.scripts]
-collect_logs = "flightanalysis.scripts.batch_analyse:main"
-flightline = "flightanalysis.scripts.collect_scores:main"
+batch_analyse = "flightanalysis.scripts.batch_analyse:main"
+collect_scores = "flightanalysis.scripts.collect_scores:main"
 
 [tool.setuptools.dynamic]
 dependencies = {file = ["requirements.txt"]}

flightanalysis-0.2.9/.github/workflows/publish_pypi.yml

@@ -1,95 +0,0 @@
-name: Publish to PyPI and create GH release
-
-on:
-  push:
-    tags:
-      - 'v[0-9]+.[0-9]+.[0-9]+'
-jobs:
-  build:
-    name: Build distribution
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: 3.x
-
-    - name: Install dependencies
-      run: pip install -r requirements.txt
-    
-    - name: Install pypa / build
-      run: python3 -m pip install build --user
-    
-    - name: Build a binary wheel and a source tarball
-      run: python3 -m build
-    
-    - name: Store the distribution packages
-      uses: actions/upload-artifact@v3
-      with:
-        name: python-package-distributions
-        path: dist/
-  
-  publish-to-pypi:
-    name: Publish Python distribution to PyPI
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: pypi
-      url: https://pypi.org/p/<package-name>
-    permissions:
-      id-token: write  # IMPORTANT: mandatory for trusted publishing
-
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v3
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Publish distribution to PyPI
-      uses: pypa/gh-action-pypi-publish@release/v1
-
-  github-release:
-    name: >-
-      Sign the Python 🐍 distribution 📦 with Sigstore
-      and upload them to GitHub Release
-    needs:
-    - publish-to-pypi
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write  # IMPORTANT: mandatory for making GitHub Releases
-      id-token: write  # IMPORTANT: mandatory for sigstore
-
-    steps:
-    - name: Download all the dists
-      uses: actions/download-artifact@v3
-      with:
-        name: python-package-distributions
-        path: dist/
-    - name: Sign the dists with Sigstore
-      uses: sigstore/gh-action-sigstore-python@v1.2.3
-      with:
-        inputs: >-
-          ./dist/*.tar.gz
-          ./dist/*.whl
-    - name: Create GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      run: >-
-        gh release create
-        '${{ github.ref_name }}'
-        --repo '${{ github.repository }}'
-        --notes ""
-    - name: Upload artifact signatures to GitHub Release
-      env:
-        GITHUB_TOKEN: ${{ github.token }}
-      # Upload to GitHub Release using the `gh` CLI.
-      # `dist/` contains the built packages, and the
-      # sigstore-produced signatures and certificates.
-      run: >-
-        gh release upload
-        '${{ github.ref_name }}' dist/**
-        --repo '${{ github.repository }}'

flightanalysis-0.2.9/flightanalysis.egg-info/entry_points.txt

@@ -1,3 +0,0 @@
-[console_scripts]
-collect_logs = flightanalysis.scripts.batch_analyse:main
-flightline = flightanalysis.scripts.collect_scores:main