Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bugfix478 import from metplotpy.contributed instead of relative import #483

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 3 additions & 20 deletions .github/workflows/trigger_metplus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- develop
- 'main_v[0-9]+.[0-9]+'
paths-ignore:
- 'docs/**'
- '.github/pull_request_template.md'
Expand All @@ -16,24 +17,6 @@ jobs:
name: Trigger METplus testing workflow
runs-on: ubuntu-latest
steps:
- name: Print GitHub values for reference
env:
GITHUB_CONTEXT: ${{ toJson(github) }}
run: echo "$GITHUB_CONTEXT"
- uses: actions/github-script@v7
- uses: dtcenter/metplus-action-trigger-use-cases@v1
with:
github-token: ${{ secrets.METPLUS_BOT_TOKEN }}
script: |
await github.rest.actions.createWorkflowDispatch({
owner: 'dtcenter',
repo: 'METplus',
workflow_id: 'testing.yml',
ref: 'develop',
inputs: {
repository: '${{ github.repository }}',
ref: '${{ github.ref }}',
actor: '${{ github.actor }}',
sha: '${{ github.sha }}',
pusher_email: '${{ github.event.pusher.email }}'
},
});
token: ${{ secrets.METPLUS_BOT_TOKEN }}
36 changes: 0 additions & 36 deletions .github/workflows/vulnerabilities.yaml

This file was deleted.

156 changes: 13 additions & 143 deletions docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describes the bugfix, enhancement, or new feature:
METplotpy Release Notes
=======================

METplotpy Version 3.0.0-rc1 release notes (20241114)
METplotpy Version 3.0.0 release notes (20241218)
------------------------------------------------------

.. dropdown:: New Plots
Expand All @@ -20,170 +20,40 @@ METplotpy Version 3.0.0-rc1 release notes (20241114)

.. dropdown:: Enhancements

None



.. dropdown:: Internal

None


.. dropdown:: Bugfixes

None



METplotpy Version 3.0.0-beta6 release notes (20241018)
------------------------------------------------------

.. dropdown:: New Plots

None

.. dropdown:: Enhancements

* Improve logging for STIGS on remaining plots (`METplus-Internal#57 <https://github.com/dtcenter/METplus-internal/issues/57>`_)
* Plot new TC-Diagnostics output from TC-Pairs (`#233 <https://github.com/dtcenter/METplotpy/issues/233>`_)

.. dropdown:: Internal

* Improve unit test infrastructure and coverage (`#461 <https://github.com/dtcenter/METplotpy/issues/461>`_)

.. dropdown:: Bugfixes

None

METplotpy Version 3.0.0-beta5 release notes (20240630)
------------------------------------------------------


.. dropdown:: New Plots


.. dropdown:: Enhancements


* **Enhance TCMPR plotter to read TCDiag lines and filter by one column and plot another column** (`#342 <https://github.com/dtcenter/METplotpy/issues/342>`_).

* Create documentation and testing for TCMPR plotting code (`#383 <https://github.com/dtcenter/METplotpy/issues/383>`_).

* Update fv3_physics_tend for new FV3 output format (`#380 <https://github.com/dtcenter/METplotpy/issues/380>`_).

.. dropdown:: Internal


* Update GitHub issue and pull request templates to reflect the current development workflow details (`#388 <https://github.com/dtcenter/METplotpy/issues/388>`_).

* Consider using only .yml or only .yaml extensions (`#417 <https://github.com/dtcenter/METplotpy/issues/417>`_).

* METplotpy:Code coverage statistics (`#55 <https://github.com/dtcenter/METplus-Internal/issues/55>`_).


.. dropdown:: Bugfixes


METplotpy Version 3.0.0-beta4 release notes (20240417)
------------------------------------------------------

.. dropdown:: New Plots


.. dropdown:: Enhancements


* Update fv3_physics_tend for new FV3 output format (`#380 <https://github.com/dtcenter/METplotpy/issues/380>`_).
* Update GitHub actions workflows to switch from node 16 to node 20 (`#414 <https://github.com/dtcenter/METplotpy/issues/414>`_).

* **Add GitHub action to run SonarQube for METplotpy pull requests and feature branches** (`#429 <https://github.com/dtcenter/METplotpy/issues/429>`_).


.. dropdown:: Internal



.. dropdown:: Bugfixes


* **TC-RMW plot needs updating to support changes to input** (`#425 <https://github.com/dtcenter/METplotpy/issues/425>`_).



METplotpy Version 3.0.0-beta3 release notes (20240206)
------------------------------------------------------


.. dropdown:: New Plots



.. dropdown:: Enhancements


* **Add a summary curve to the ROC diagram** (`#399 <https://github.com/dtcenter/METplotpy/issues/399>`_).
* **Hide/show the legend entries line-by-line** (`#355 <https://github.com/dtcenter/METplotpy/issues/355>`_).
* **Specify the color of the no resolution and no skill lines for the reliability diagram** (`#329 <https://github.com/dtcenter/METplotpy/issues/329>`_).


.. dropdown:: Internal



.. dropdown:: Bugfixes

* TC-RMW plot needs updating to support changes to input (`#425 <https://github.com/dtcenter/METplotpy/issues/425>`_).




METplotpy Version 3.0.0-beta2 release notes (20231108)
------------------------------------------------------

.. dropdown:: New Plots


.. dropdown:: Enhancements


* **hide/show the legend entries line-by-line** (`#355 <https://github.com/dtcenter/METplotpy/issues/355>`_).


* **specify the color of the no resolution and no skill lines for the reliability diagram** (`#329 <https://github.com/dtcenter/METplotpy/issues/329>`_).

.. dropdown:: Internal

* Improve unit test infrastructure and coverage (`#461 <https://github.com/dtcenter/METplotpy/issues/461>`_)
* Update GitHub issue and pull request templates to reflect the current development workflow details (`#388 <https://github.com/dtcenter/METplotpy/issues/388>`_).
* Consider using only .yml or only .yaml extensions (`#417 <https://github.com/dtcenter/METplotpy/issues/417>`_).
* METplotpy: Code coverage statistics (`#55 <https://github.com/dtcenter/METplus-Internal/issues/55>`_).


.. dropdown:: Bugfixes

* **Documentation-Fix METviewer link in line plot** (`#385 <https://github.com/dtcenter/METplotpy/issues/385>`_).
.. dropdown:: Bugfixes

* TC-RMW plot needs updating to support changes to input (`#425 <https://github.com/dtcenter/METplotpy/issues/425>`_).
* **Documentation - Fix METviewer link in line plot** (`#385 <https://github.com/dtcenter/METplotpy/issues/385>`_).
* **Inconsistency with generating plot in METviewer vs command line** (`#391 <https://github.com/dtcenter/METplotpy/issues/391>`_).

* **Bugfix for ROC plot image saving to file** (`#394 <https://github.com/dtcenter/METplotpy/issues/394>`_).

* Bugfix for erros in line and revision_series tests (`#401 <https://github.com/dtcenter/METplotpy/issues/401>`_).


METplotpy Version 3.0.0-beta1 release notes (20230915)
------------------------------------------------------

.. dropdown:: New Plots


.. dropdown:: Enhancements


.. dropdown:: Internal


.. dropdown:: Bugfixes


* Bugfix for errors in line and revision_series tests (`#401 <https://github.com/dtcenter/METplotpy/issues/401>`_).


METplotpy Upgrade Instructions
==============================

Upgrade instructions will be listed here if they are
applicable for this release.
None


10 changes: 7 additions & 3 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,25 @@
import os
import sys
sys.path.insert(0, os.path.abspath('.'))
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__),
os.pardir)))
print(sys.path)

from metplotpy import __version__ as version

# -- Project information -----------------------------------------------------

project = 'METplotpy'
copyright = '2024, NSF NCAR'
author = 'UCAR/NSF NCAR, NOAA, CSU/CIRA, and CU/CIRES'
author_list = 'Fisher, H., D. Adriaansen, C. Kalb, D. Fillmore, T. Jensen, L. Goodrich, M. Win-Gildenmeister and T. Burek'
version = 'v3.0.0-rc1'
author_list = 'Adriaansen, D., C. Kalb, D. Fillmore, T. Jensen, L. Goodrich, M. Win-Gildenmeister, T. Burek, and H. Fisher'

version = '3.0.0'
verinfo = version
release = f'{version}'
release_year = '2024'

release_date = f'{release_year}-11-14'
release_date = f'{release_year}-12-18'

copyright = f'{release_year}, {author}'

Expand Down
21 changes: 21 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,27 @@ Boulder, CO

.. image:: _static/METplus_banner_photo_web.png

In Memoriam
-----------
This coordinated release is dedicated to three remarkable team members
we lost in 2024, whose contributions have left an indelible mark on our work.

To `Tara Jensen <https://dtcenter.org/news/2024/04#3032>`_,
for her vision and leadership in creating METplus as well as her
dedication, dogged determination, and mentorship that shaped its growth and
trajectory, leaving a legacy of innovation in the field of verification.

To `Randy Bullock <https://dtcenter.org/news/2024/04#3031>`_,
whose verification libraries formed the basis of MET and
whose mathematical brilliance, passion for maps, grid projections, and
graphics enriched and inspired new capabilities.

To `Venita Hagerty <https://sites.gsl.noaa.gov/authors/365>`_,
for her pivotal expertise, support, and attention to
detail that ensured the success of METdataio and METexpress.

Their contributions to METplus continue to guide and inspire us each day.

History
-------
The Model Evaluation Tools (MET) were developed by the Developmental Testbed
Expand Down
2 changes: 1 addition & 1 deletion metplotpy/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.0.0-beta6-dev"
__version__ = "3.0.0-rc1"
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
from metpy.units import units
import numpy as np
import pandas as pd
import metplotpy.contributed.fv3_physics_tend.physics_tend
import xarray
import yaml
from . import physics_tend

def parse_args():
"""
Expand Down
2 changes: 1 addition & 1 deletion metplotpy/contributed/fv3_physics_tend/planview_fv3.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from metpy.units import units
import numpy as np
import pandas as pd
import metplotpy.contributed.fv3_physics_tend.physics_tend
import xarray
import yaml
from . import physics_tend

def parse_args():
"""
Expand Down
2 changes: 1 addition & 1 deletion metplotpy/contributed/fv3_physics_tend/vert_profile_fv3.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
from matplotlib.ticker import MultipleLocator
from metpy.units import units
import pandas as pd
import metplotpy.contributed.fv3_physics_tend.physics_tend
import xarray
import yaml
from . import physics_tend

def parse_args():
"""
Expand Down
5 changes: 4 additions & 1 deletion metplotpy/plots/base_plot.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@
import yaml
from typing import Union

import plotly.io as pio

import metplotpy.plots.util
from .config import Config
from metplotpy.plots.context_filter import ContextFilter


# set kaleido to use single process to prevent GPU errors in containers
pio.kaleido.scope.chromium_args += ("--single-process",)

class BasePlot:
"""A class that provides methods for building Plotly plot's common features
Expand Down
5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ version = {attr = "metplotpy.__version__"}
[tool.setuptools.packages]
find = {include = ["metplotpy*"]}

[tool.setuptools.package-data]
metplotpy = [
"plots/config/**",
]

[tool.pytest.ini_options]
testpaths = ["test"]

Expand Down
Loading