pycontrails 0.39.4__tar.gz → 0.39.5__tar.gz

{pycontrails-0.39.4 → pycontrails-0.39.5}/.github/pull_request_template.md

@@ -2,7 +2,7 @@ Closes #XX
 
 ## Changes
 
-> Description of changes in this PR. 
+> Description of changes in this PR.
 > Use `make changelog` for starter.
 > Should be copied and commit to `CHANGELOG.md`
 
@@ -17,7 +17,6 @@ Closes #XX
 ## Tests
 
 - [ ] QC test passes locally (`make test`)
-- [ ] Notebook test passes (`make nbtest`)
 - [ ] CI tests pass
 
 ## Reviewer

{pycontrails-0.39.4 → pycontrails-0.39.5}/.github/workflows/docs.yaml

@@ -5,13 +5,11 @@
 # Currently hosted at https://py.contrails.org
 name: Docs
 
-# only build docs on release
+# only build docs on release tags
 on:
-  release:
-    types:
-      - published
-    branches:
-      - main
+  push:
+    tags:
+      - '*'
 
   # Allows run manually from the Actions tab
   workflow_dispatch:

pycontrails-0.39.5/.zenodo.json

@@ -0,0 +1,23 @@
+{
+  "creators": [
+    {
+      "name": "Marc Shapiro",
+      "affiliation": "Breakthrough Energy"
+    },
+    {
+      "name": "Zeb Engberg",
+      "affiliation": "Breakthrough Energy"
+    },
+    {
+      "name": "Roger Teoh",
+      "affiliation": "Imperial College London"
+    },
+    {
+      "name": "Tom Dean",
+      "affiliation": "Breakthrough Energy"
+    }
+  ],
+  "license": "Apache-2.0",
+  "title": "pycontrails: Python library for modeling aviation climate impacts",
+  "description": "<p><strong>pycontrails</strong> is an open source project and Python package for modeling aircraft contrails and other<br>\naviation related climate impacts.</p>\n\n<p><code>pycontrails</code> defines common data structures and interfaces to efficiently build and run models of aircraft performance, emissions, and radiative forcing.</p>\n\n<p>See the <a href=\"https://github.com/contrailcirrus/pycontrails\">Github repository</a> and <a href=\"https://py.contrails.org\">documentation</a> for more information.</p>"
+}

{pycontrails-0.39.4 → pycontrails-0.39.5}/CHANGELOG.md

@@ -1,6 +1,18 @@
 
 # Changelog
 
+## v0.39.5
+
+#### Fixes
+
+- Fix `docs/examples/CoCiP.ipynb` example demonstrating aircraft performance integration
+- Fix unit test caused by breaking change in [pyproj 3.5.0](https://github.com/pyproj4/pyproj/releases/tag/3.5.0)
+
+#### Internals
+
+- Add additional Zenodo metadata
+- Execute notebook examples in [Docs Action](https://github.com/contrailcirrus/pycontrails/actions/workflows/docs.yaml)
+
 ## v0.39.4
 
 #### Internals

{pycontrails-0.39.4 → pycontrails-0.39.5}/Makefile

@@ -156,11 +156,12 @@ nb-black:
 nb-black-check:
 	black docs/examples/*.ipynb --check
 
-nb-test: ensure-era5-cached nb-black-check
-	pytest -W ignore --nbval-lax -p no:python --ignore-glob=*/ACCF.ipynb docs/examples
+nb-test: ensure-era5-cached nb-black-check nb-check-links
+	pytest --nbval-lax --ignore-glob=*/ACCF.ipynb docs/examples
 
 # execute notebooks for docs output
 # Note that nb-test will fail after running this locally
+# TODO: this currently breaks the xarray notebook output styling somehow
 nb-execute: nb-black-check
 	jupyter nbconvert --inplace \
 		--ClearMetadataPreprocessor.enabled=True \

{pycontrails-0.39.4 → pycontrails-0.39.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.39.4
+Version: 0.39.5
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0

{pycontrails-0.39.4 → pycontrails-0.39.5}/docs/examples/CoCiP.ipynb

@@ -1157,9 +1157,12 @@
    "outputs": [],
    "source": [
     "# create BADA model\n",
+    "import pathlib\n",
     "from pycontrails.ext.bada import BADAFlight\n",
     "\n",
-    "bada_model = BADAFlight()"
+    "# Note this requires BADA 3 performance data files in a\n",
+    "# `bada` directory next to the `pycontrails` directory\n",
+    "bada_model = BADAFlight(bada3_path=pathlib.Path(\"../../../bada/bada3\"))"
    ]
   },
   {

{pycontrails-0.39.4 → pycontrails-0.39.5}/pycontrails/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.39.4'
-__version_tuple__ = version_tuple = (0, 39, 4)
+__version__ = version = '0.39.5'
+__version_tuple__ = version_tuple = (0, 39, 5)

{pycontrails-0.39.4 → pycontrails-0.39.5}/pycontrails/utils/synthetic_flight.py

@@ -297,7 +297,9 @@ class SyntheticFlight:
                 raise ValueError("Cannot create flight. Increase dimensions in `bounds`.")
             return self._generate_single_flight_no_wind(timestep)  # recursive
 
-        result = self.geod.fwd_intermediate(*src, az, npts, m_per_timestep)  # type: ignore
+        result = self.geod.fwd_intermediate(
+            *src, az, npts, m_per_timestep, return_back_azimuth=False  # type: ignore
+        )
         longitude = np.asarray(result.lons)
         latitude = np.asarray(result.lats)
         if geo.haversine(longitude[-1], latitude[-1], *dest) > m_per_timestep:

{pycontrails-0.39.4 → pycontrails-0.39.5}/pycontrails.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.39.4
+Version: 0.39.5
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0

{pycontrails-0.39.4 → pycontrails-0.39.5}/pycontrails.egg-info/requires.txt

@@ -2,7 +2,7 @@ dask>=2022.3
 numpy>=1.22
 overrides>=6.1
 pandas>=1.4
-pyproj>=3.0
+pyproj>=3.5
 scipy<1.10,>=1.9
 xarray>=2022.3
 
@@ -40,7 +40,7 @@ furo>=2023.3
 myst-parser>=1.0
 nb-clean>=2.4
 nbsphinx>=0.8
-nbval
+nbval!=0.10.0,>=0.9.6
 pytest-check-links>=0.8.0
 sphinx>=4.2
 sphinx-autobuild>=0.7

{pycontrails-0.39.4 → pycontrails-0.39.5}/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "numpy>=1.22",
     "overrides>=6.1",
     "pandas>=1.4",
-    "pyproj>=3.0",
+    "pyproj>=3.5",
     "scipy>=1.9,<1.10",  # FIXME: To be fixed early 2023
     "xarray>=2022.3",
 ]
@@ -87,7 +87,7 @@ docs = [
     "myst-parser>=1.0",
     "nb-clean>=2.4",
     "nbsphinx>=0.8",
-    "nbval",
+    "nbval>=0.9.6,!=0.10.0",
     "pytest-check-links>=0.8.0",
     "sphinx>=4.2",
     "sphinx-autobuild>=0.7",
@@ -221,6 +221,7 @@ filterwarnings = [
     "ignore:`np.bool8` is a deprecated alias:DeprecationWarning:skimage.util.dtype",
     "ignore:'cgi' is deprecated and slated:DeprecationWarning:google.cloud.storage.blob",
     "ignore:Engine 'cfgrib' loading failed:RuntimeWarning:xarray.backends.plugins",
+    "ignore:.*IPyNbFile:pytest.PytestRemovedIn8Warning:_pytest.nodes",
 ]
 testpaths = ["tests/unit"]
 

pycontrails-0.39.4/.zenodo.json

@@ -1,22 +0,0 @@
-{
-    "creators": [
-        {
-            "name": "Marc Shapiro",
-            "affiliation": "Breakthrough Energy"
-        },
-        {
-            "name": "Zeb Engberg",
-            "affiliation": "Breakthrough Energy"
-        },
-        {
-            "name": "Roger Teoh",
-            "affiliation": "Imperial College London"
-        },
-        {
-            "name": "Tom Dean",
-            "affiliation": "Breakthrough Energy"
-        }
-    ],
-    "license": "Apache-2.0",
-    "title": "pycontrails: Python library for modeling aviation climate impacts"
-}