Merge remote-tracking branch 'upstream/main' into setup

SciTools · Sep 26, 2024 · 8258d87 · 8258d87
2 parents 9cf0ace + d22c5ea
commit 8258d87
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/cf_units/tests/integration/parse/test_graph.py b/cf_units/tests/integration/parse/test_graph.py
@@ -2,6 +2,9 @@
 #
 # This file is part of cf-units and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
+import pytest
+
+antlr4 = pytest.importorskip("antlr4")
 
 import cf_units._udunits2_parser.graph as g
 from cf_units._udunits2_parser import parse

diff --git a/cf_units/tests/integration/parse/test_parse.py b/cf_units/tests/integration/parse/test_parse.py
@@ -2,6 +2,9 @@
 #
 # This file is part of cf-units and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
+import pytest
+
+antlr4 = pytest.importorskip("antlr4")
 
 import re
 

diff --git a/cf_units/tests/test_tex.py b/cf_units/tests/test_tex.py
@@ -2,6 +2,9 @@
 #
 # This file is part of cf-units and is released under the BSD license.
 # See LICENSE in the root of the repository for full licensing details.
+import pytest
+
+antlr4 = pytest.importorskip("antlr4")
 
 from cf_units.tex import tex
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -31,7 +31,6 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Oceanography",
 ]
 dependencies = [
-    "antlr4-python3-runtime ==4.11.1",   # To update this, see cf_units/_udunits2_parser/README.md
     "cftime >=1.2",
     "jinja2",
     "numpy ==1.26.4"
@@ -59,7 +58,9 @@ readme = "README.md"
 requires-python = ">=3.10"
 
 [project.optional-dependencies]
-all = ["cf-units[docs]", "cf-units[test]"]
+all = ["cf-units[latex]", "cf-units[docs]", "cf-units[test]"]
+# To update antlr: see cf_units/_udunits2_parser/README.md"
+latex = ["antlr4-python3-runtime ==4.11.1"]
 docs = ["sphinx"]
 test = ["codecov", "cython", "jinja2", "pip", "pytest", "pytest-cov"]
 

diff --git a/requirements/cf-units.yml b/requirements/cf-units.yml
@@ -11,7 +11,6 @@ dependencies:
   - numpy
 
 # core dependencies
-  - antlr-python-runtime 4.11.1.*  # To update this, see cf_units/_udunits2_parser/README.md
   - cftime>=1.2
   - numpy<2
   - udunits2
@@ -28,3 +27,5 @@ dependencies:
 
 # docs dependencies
   - sphinx
+# latex
+  - antlr-python-runtime 4.11.1.*  # To update this, see cf_units/_udunits2_parser/README.md