flightplotting 0.2.3__tar.gz → 0.2.5__tar.gz

flightplotting-0.2.5/.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

flightplotting-0.2.5/.gitignore

@@ -0,0 +1,130 @@
+# Byte-compiled / optimized / DLL files
+logs/
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

flightplotting-0.2.5/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+    "python.testing.pytestArgs": [
+        "tests"
+    ],
+    "python.testing.unittestEnabled": false,
+    "python.testing.pytestEnabled": true
+}

{flightplotting-0.2.3/flightplotting.egg-info → flightplotting-0.2.5}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.3
+Version: 0.2.5
 Summary: Tools for Plotting Flight Data in Plotly
-Home-page: https://github.com/PyFlightCoach/FlightPlotting
-Author: Thomas David
-Author-email: thomasdavid0@gmail.com
+Author-email: Thomas David <thomasdavid0@gmail.com>
+License: GNU GPL v3
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: setuptools
-Requires-Dist: plotly
 Requires-Dist: numpy
 Requires-Dist: pandas
+Requires-Dist: plotly
 Requires-Dist: pfc-geometry>=0.2.4
 Requires-Dist: flightdata>=0.2.6
 Requires-Dist: flightanalysis>=0.2.6
@@ -19,3 +19,12 @@ Requires-Dist: flightanalysis>=0.2.6
 
 
 This module contains utilities for plotting flight data using plotly
+
+
+```bash
+pip install flightplotting
+```
+
+```bash
+pip install -e .
+```

{flightplotting-0.2.3 → flightplotting-0.2.5}/README.md

@@ -2,3 +2,12 @@
 
 
 This module contains utilities for plotting flight data using plotly
+
+
+```bash
+pip install flightplotting
+```
+
+```bash
+pip install -e .
+```

{flightplotting-0.2.3 → flightplotting-0.2.5}/flightplotting/__init__.py

@@ -1,4 +1,4 @@
 
 
 from flightplotting.plots import plotsec, plot_analysis, plotdtw, create_3d_plot, plot_regions
-from flightplotting.traces import axestrace, trace3d, dtwtrace, vector, vectors, boxtrace, axis_rate_traces, colour_from_scale
+from flightplotting.traces import axestrace, trace3d, dtwtrace, vector, vectors, boxtrace, axis_rate_traces, colour_from_scale, get_colour

{flightplotting-0.2.3 → flightplotting-0.2.5}/flightplotting/plots.py

@@ -15,6 +15,7 @@ from flightplotting.traces import (
 )
     
 from flightdata import State
+from flightdata.base.labeling import get_appended_id
 from geometry import Coord
 from flightplotting.model import obj, OBJ
 import numpy as np
@@ -99,10 +100,11 @@ def plotdtw(sec: State, manoeuvres: List[str], span=3, fig=None):
 
     return fig
 
-def plot_regions(st: State, lab_cols: list[str], span=3, colours=None, fig=None):
+def plot_regions(st: State, lab_cols: list[str], span=3, colours=None, fig=None, **kwargs):
     colours = px.colors.qualitative.Plotly if colours is None else colours
     lab_cols = [lab_cols] if isinstance(lab_cols, str) else lab_cols
 
+
     st = st.label(clabs=st.cumulative_labels(*lab_cols))
     
     def get_base_label(clab):
@@ -118,21 +120,22 @@ def plot_regions(st: State, lab_cols: list[str], span=3, colours=None, fig=None)
 
     traces = []
     for i, (k, seg) in enumerate(st.split_labels('clabs').items()):
-        blab = get_base_label(k)
+        if len(seg) < 3:
+            continue
+        blab, id = get_appended_id(k)
         if blab not in colmap:
             colmap[blab] = colours[len(colmap) % len(colours)]
-            leg = True
-        else:
-            leg = False
-
-        traces += ribbon(seg, span, colmap[blab], name=k, showlegend=leg)
-
+        traces += ribbon(
+            seg, span, colmap[blab], name=blab,
+            showlegend=int(id)==0,
+            **kwargs[blab] if blab in kwargs else {}
+        )
         traces.append(go.Scatter3d(
             x=seg.pos.x, 
             y=seg.pos.y, 
             z=seg.pos.z,
             mode='lines', 
-            line=dict(width=6, color=colmap[blab]), 
+            line=dict(width=0, color=colmap[blab]), 
             name=k,
             showlegend=False
         ))

{flightplotting-0.2.3 → flightplotting-0.2.5}/flightplotting/traces.py

@@ -254,7 +254,6 @@ def ribbon(sec: State, span: float, color, **kwargs):
     _ks = np.array(range(2, len(points) -1 , 2))
     _k = _npinterzip(_ks, _ks) # 2 2 4 4 6 6 
 
-
     return [go.Mesh3d(
         x=points.x, y=points.y, z=points.z, i=_i, j=_j, k=_k,
         intensitymode="cell",

{flightplotting-0.2.3 → flightplotting-0.2.5/flightplotting.egg-info}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.1
 Name: flightplotting
-Version: 0.2.3
+Version: 0.2.5
 Summary: Tools for Plotting Flight Data in Plotly
-Home-page: https://github.com/PyFlightCoach/FlightPlotting
-Author: Thomas David
-Author-email: thomasdavid0@gmail.com
+Author-email: Thomas David <thomasdavid0@gmail.com>
+License: GNU GPL v3
+Classifier: Programming Language :: Python :: 3
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: setuptools
-Requires-Dist: plotly
 Requires-Dist: numpy
 Requires-Dist: pandas
+Requires-Dist: plotly
 Requires-Dist: pfc-geometry>=0.2.4
 Requires-Dist: flightdata>=0.2.6
 Requires-Dist: flightanalysis>=0.2.6
@@ -19,3 +19,12 @@ Requires-Dist: flightanalysis>=0.2.6
 
 
 This module contains utilities for plotting flight data using plotly
+
+
+```bash
+pip install flightplotting
+```
+
+```bash
+pip install -e .
+```

{flightplotting-0.2.3 → flightplotting-0.2.5}/flightplotting.egg-info/SOURCES.txt

@@ -1,8 +1,11 @@
+.gitignore
 COPYING
 MANIFEST.in
 README.md
-setup.cfg
-setup.py
+pyproject.toml
+requirements.txt
+.github/workflows/publish_pypi.yml
+.vscode/settings.json
 flightplotting/__init__.py
 flightplotting/model.py
 flightplotting/plots.py
@@ -16,4 +19,7 @@ flightplotting.egg-info/requires.txt
 flightplotting.egg-info/top_level.txt
 flightplotting/data/ColdDraftF3APlane.obj
 flightplotting/data/__init__.py
-tests/test_plots.py
+tests/__init__.py
+tests/test_plots.py
+tests/data/__init__.py
+tests/data/p23_flight.json

{flightplotting-0.2.3 → flightplotting-0.2.5}/flightplotting.egg-info/requires.txt

@@ -1,7 +1,6 @@
-setuptools
-plotly
 numpy
 pandas
+plotly
 pfc-geometry>=0.2.4
 flightdata>=0.2.6
 flightanalysis>=0.2.6

flightplotting-0.2.5/pyproject.toml

@@ -0,0 +1,21 @@
+[build-system]
+requires = [
+    "setuptools>=60",
+    "setuptools-scm>=8.0"
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "flightplotting"
+authors = [{name = "Thomas David", email = "thomasdavid0@gmail.com"}]
+description = "Tools for Plotting Flight Data in Plotly"
+readme = "README.md"
+requires-python = ">=3.12"
+license = {text = "GNU GPL v3"}
+classifiers = ["Programming Language :: Python :: 3",]
+dynamic = ["version", "dependencies"]
+
+[tool.setuptools.dynamic]
+dependencies = {file = ["requirements.txt"]}
+
+[tool.setuptools_scm]

flightplotting-0.2.5/requirements.txt

@@ -0,0 +1,6 @@
+numpy
+pandas
+plotly
+pfc-geometry>=0.2.4
+flightdata>=0.2.6
+flightanalysis>=0.2.6

flightplotting-0.2.5/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+