Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cc3da2d
begin removals and edits
ilaflott May 19, 2026
390ec1c
Remove cmip6 and cmip7 cmor tables submodules
ilaflott May 19, 2026
d5bf73f
remove test files
ilaflott May 19, 2026
fe9d858
remove a cmor reference here and there, remove cmor_helpers which wil…
ilaflott May 19, 2026
c98bef7
remove down to the stubs, raise notimplementederror, make imports exp…
ilaflott May 19, 2026
8ed1f12
more stub replacement and remove the constants file
ilaflott May 19, 2026
7dce9ad
remove the tests folder. the CLI stubs will be verified in fre/tests
ilaflott May 19, 2026
6f76a62
nuke the tests
ilaflott May 19, 2026
e918f6e
remove cmor docs
ilaflott May 19, 2026
063f3b5
remove references to fre.cmor and redirect to fremor
ilaflott May 19, 2026
4b1efdb
remove cmor_info_parser
ilaflott May 19, 2026
3633153
remove more fre cmor references and encourage migration to fremor
ilaflott May 19, 2026
6475c6d
remove a doomed test
ilaflott May 19, 2026
c64d5a6
Update combine_yamls_script.py
ilaflott May 19, 2026
30ecde6
remove large CDL file no longer needed
ilaflott May 19, 2026
8292b09
gut even more
ilaflott May 19, 2026
a07841e
fix else position
ilaflott May 19, 2026
666deb7
remove unused imports
ilaflott May 19, 2026
f6210c2
unused imports
ilaflott May 19, 2026
5892d9d
adjust test exit code expectation and remove a yamltools cmor test
ilaflott May 19, 2026
039da7f
new pylint threshold
ilaflott May 19, 2026
c15e7d2
to replicate the bug, run pytest -x -vv --log-level DEBUG fre/tests/t…
ilaflott May 19, 2026
7c11b59
fixing a testing bug...
ilaflott May 19, 2026
b00bbe5
adjust test logging condition slightly and adjust e.g. order for futu…
ilaflott May 19, 2026
9ba2ae3
more nuanced success condition
ilaflott May 19, 2026
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
1 change: 0 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@
"fre_cli.egg-info",
"fre/mkmf",
"fre/gfdl_msd_schemas",
"fre/tests/test_files/cmip6-cmor-tables"
]
}
4 changes: 2 additions & 2 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ pytest -v fre/[tool]/tests/test_functionality.py::test_a_single_test
pytest -v fre/app/[app]/tests/test_functionality.py::test_a_single_test

# Code quality
pylint --fail-under 7.00 --max-line-length 120 --max-args 6 -ry --ignored-modules netCDF4,cmor fre/
pylint --fail-under 7.00 --max-line-length 120 --max-args 6 -ry --ignored-modules netCDF4 fre/
```

**Critical notes**:
Expand All @@ -65,7 +65,7 @@ pylint --fail-under 7.00 --max-line-length 120 --max-args 6 -ry --ignored-module

**Command pattern**: `fre [tool] [sub-command] [options]`

**Available tools**: `analysis`, `app`, `catalog`, `check`, `cmor`, `list`, `make`, `pp`, `run`, `yamltools`
**Available tools**: `analysis`, `app`, `catalog`, `check`, `list`, `make`, `pp`, `run`, `yamltools`

## Critical Notes

Expand Down
7 changes: 0 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,3 @@
[submodule "fre/gfdl_msd_schemas"]
path = fre/gfdl_msd_schemas
url = https://github.com/NOAA-GFDL/gfdl_msd_schemas
[submodule "fre/tests/test_files/cmip6-cmor-tables"]
path = fre/tests/test_files/cmip6-cmor-tables
url = https://github.com/pcmdi/cmip6-cmor-tables
[submodule "fre/tests/test_files/cmip7-cmor-tables"]
path = fre/tests/test_files/cmip7-cmor-tables
url = https://github.com/WCRP-CMIP/cmip7-cmor-tables.git
branch = main
3 changes: 0 additions & 3 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
include README.md
include LICENSE.md
recursive-include fre *
# Exclude Python files from cmip6-cmor-tables submodule that have Python 2 syntax
exclude fre/tests/test_files/cmip6-cmor-tables/CMIP6_CVs/src/*.py
exclude fre/tests/test_files/cmip6-cmor-tables/scripts/*.py
1 change: 0 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
'catalogbuilder',
'cdo',
'cftime',
'cmor',
'cylc',
'cylc-flow',
'cylc-rose',
Expand Down
2 changes: 1 addition & 1 deletion docs/contributing_to_doc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
lightweight approach (recommended for docs-only)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
If you only need to build documentation and don't need the full ``fre-cli`` environment,
you can use a minimal setup. This approach uses ``autodoc_mock_imports`` in ``docs/conf.py``

Check warning on line 55 in docs/contributing_to_doc.rst

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (autodoc)
to mock heavy dependencies like ``netCDF4``, ``cmor``, ``xarray``, etc.
to mock heavy dependencies like ``netCDF4``, ``xarray``, etc.

From the root-directory of your local repository copy:

Expand All @@ -66,7 +66,7 @@
# Install minimal dependencies
pip install sphinx renku-sphinx-theme sphinx-rtd-theme click pyyaml jsonschema

# Set PYTHONPATH so Sphinx can find the fre modules

Check warning on line 69 in docs/contributing_to_doc.rst

View workflow job for this annotation

GitHub Actions / spellcheck

Unknown word (PYTHONPATH)
export PYTHONPATH="${PWD}:${PYTHONPATH}"

# Generate API docs and build
Expand Down
10 changes: 2 additions & 8 deletions docs/tools.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,11 @@ Argument flags are not positional, can be specified in any order. Some arguments
``fre cmor``
============

* See also, ``fre cmor``'s `README <https://github.com/NOAA-GFDL/fre-cli/blob/main/fre/cmor/README.md>`_
* See also, ``fre cmor``'s `project board <https://github.com/orgs/NOAA-GFDL/projects/35>`_
* Deprecated, see ``fremor`` `here <https://github.com/NOAA-GFDL/fremor>`_

This set of tools leverages the external ``cmor`` python package within the ``fre`` ecosystem. ``cmor`` is an
acronym for "climate model output rewriter". The process of rewriting model-specific output files for model
intercomparisons (MIPs) using the ``cmor`` module is, quite cleverly, referred to as "CMORizing".
please use ``NOAA-GFDL/fremor``


.. include:: tools/cmor.rst


``fre make``
============

Expand Down
110 changes: 0 additions & 110 deletions docs/tools/cmor.rst

This file was deleted.

4 changes: 0 additions & 4 deletions docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ Postprocess FMS history output
.. include:: usage/postprocess.rst
.. include:: usage/guides/fre_pp_guide.rst

CMORize Postprocessed Output
=============================
.. include:: usage/cmor.rst

Generate data catalogs
======================
.. include:: tools/catalog.rst
40 changes: 0 additions & 40 deletions docs/usage/cmor.rst

This file was deleted.

Loading
Loading