diff --git a/esmvaltool/diag_scripts/psyplot_diag.py b/archive/legacy_diag_scripts/psyplot_diag.py similarity index 100% rename from esmvaltool/diag_scripts/psyplot_diag.py rename to archive/legacy_diag_scripts/psyplot_diag.py diff --git a/esmvaltool/recipes/recipe_psyplot.yml b/archive/legacy_recipes/recipe_psyplot.yml similarity index 100% rename from esmvaltool/recipes/recipe_psyplot.yml rename to archive/legacy_recipes/recipe_psyplot.yml diff --git a/doc/sphinx/source/api/esmvaltool.diag_scripts.psyplot_diag.rst b/doc/sphinx/source/api/esmvaltool.diag_scripts.psyplot_diag.rst deleted file mode 100644 index 2dc463cc9f..0000000000 --- a/doc/sphinx/source/api/esmvaltool.diag_scripts.psyplot_diag.rst +++ /dev/null @@ -1,9 +0,0 @@ -.. _api.esmvaltool.diag_scripts.psyplot_diag: - -Psyplot Diagnostic -================== - -.. automodule:: esmvaltool.diag_scripts.psyplot_diag - :no-members: - :no-inherited-members: - :no-show-inheritance: diff --git a/doc/sphinx/source/api/esmvaltool.rst b/doc/sphinx/source/api/esmvaltool.rst index 1d16fabe2a..fbe88d5f70 100644 --- a/doc/sphinx/source/api/esmvaltool.rst +++ b/doc/sphinx/source/api/esmvaltool.rst @@ -27,7 +27,6 @@ Diagnostic Scripts esmvaltool.diag_scripts.emergent_constraints esmvaltool.diag_scripts.monitor esmvaltool.diag_scripts.ocean - esmvaltool.diag_scripts.psyplot_diag esmvaltool.diag_scripts.seaborn_diag esmvaltool.diag_scripts.portrait_plot esmvaltool.diag_scripts.climate_metrics.tcre diff --git a/doc/sphinx/source/faq.rst b/doc/sphinx/source/faq.rst index 43251a801b..c2414f08e2 100644 --- a/doc/sphinx/source/faq.rst +++ b/doc/sphinx/source/faq.rst @@ -128,11 +128,6 @@ preprocessed model. The plotting parameters are set through a yaml configuration file, and the type of plots to be generated are determined in the recipe. -Moreover, recipe :ref:`recipes_psyplot_diag` and the corresponding diagnostic -:ref:`psyplot_diag.py ` provide a -high-level interface to the `Psyplot `__ package -which can be used to create a large variety of different plots. - Similarly, recipe :ref:`recipes_seaborn_diag` and the corresponding diagnostic :ref:`seaborn_diag.py ` provide a high-level interface to the `Seaborn `__ package diff --git a/doc/sphinx/source/recipes/index.rst b/doc/sphinx/source/recipes/index.rst index c1104fb97e..b545fc7e96 100644 --- a/doc/sphinx/source/recipes/index.rst +++ b/doc/sphinx/source/recipes/index.rst @@ -25,7 +25,6 @@ large variety of input data. recipe_model_evaluation recipe_monitor recipe_portrait - recipe_psyplot recipe_seaborn recipe_ref @@ -167,6 +166,7 @@ require a legacy version of ESMValTool to run. .. toctree:: :maxdepth: 1 + recipe_psyplot recipe_rainfarm recipe_schlund20jgr recipe_spei diff --git a/doc/sphinx/source/recipes/recipe_psyplot.rst b/doc/sphinx/source/recipes/recipe_psyplot.rst index 8c04784cd1..7ab5f5077a 100644 --- a/doc/sphinx/source/recipes/recipe_psyplot.rst +++ b/doc/sphinx/source/recipes/recipe_psyplot.rst @@ -1,7 +1,13 @@ .. _recipes_psyplot_diag: -Psyplot Diagnostics -=================== +Legacy recipe: Psyplot Diagnostics +================================== + +.. note:: + + This recipe has been retired and moved to the folder "archive". This recipe is only included + for documentation purposes and not maintained any more. The last known ESMValTool version + supporting this recipe is version 2.12.0. Overview -------- @@ -18,9 +24,9 @@ Recipes are stored in recipes/ * recipe_psyplot.yml -Diagnostics are stored in diag_scripts/ +Diagnostics are stored in archive/legacy_diag_scripts - * :ref:`psyplot_diag.py ` + * psyplot_diag.py Variables diff --git a/environment.yml b/environment.yml index 9e54c20215..37fe342a96 100644 --- a/environment.yml +++ b/environment.yml @@ -49,10 +49,6 @@ dependencies: - pip !=21.3 - progressbar2 - prov - - psyplot >=1.5.0 - - psy-maps >=1.5.0 - - psy-reg >=1.5.0 - - psy-simple >=1.5.0 - pyproj >=2.1 - pys2index # only from conda-forge - python >=3.11,<3.13 diff --git a/environment_osx.yml b/environment_osx.yml index 441ee5e711..44a7b63fcf 100644 --- a/environment_osx.yml +++ b/environment_osx.yml @@ -47,10 +47,6 @@ dependencies: - pip !=21.3 - progressbar2 - prov - - psyplot >=1.5.0 - - psy-maps >=1.5.0 - - psy-reg >=1.5.0 - - psy-simple >=1.5.0 - pyproj >=2.1 - pys2index >=0.1.5 # only from conda-forge; https://github.com/ESMValGroup/ESMValTool/pull/3792 - python >=3.11,<3.13 diff --git a/setup.py b/setup.py index f3730e6a89..1d39c2d12e 100755 --- a/setup.py +++ b/setup.py @@ -55,10 +55,6 @@ "packaging", "pandas", "progressbar2", - "psyplot>=1.5.0", # psy*<1.5.0 are not py312 compat - "psy-maps>=1.5.0", - "psy-reg>=1.5.0", - "psy-simple>=1.5.0", "pyproj>=2.1", "pys2index", "python-dateutil",