From 8d69ef6b4246da3d63a3994011eac9eef03064bf Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 1 Nov 2024 14:23:31 +0000 Subject: [PATCH 1/2] Update component versions --- environment.yml | 20 ++++++++++---------- pyproject.toml | 18 +++++++++--------- tests/environment-docs-tests.yml | 22 +++++++++++----------- tests/environment-unit-tests.yml | 26 +++++++++++++------------- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/environment.yml b/environment.yml index 3b839ab..da58a6f 100644 --- a/environment.yml +++ b/environment.yml @@ -1,13 +1,13 @@ name: earthkit channels: -- conda-forge -- nodefaults + - conda-forge + - nodefaults dependencies: -- earthkit-data>=0.10.2 -- geos -- pip: - - earthkit-geo>=0.2.0 - - earthkit-meteo>=0.1.1 - - earthkit-plots>=0.2.0 - - earthkit-regrid>=0.3.4 - - earthkit-transforms>=0.3.3 + - earthkit-data>=0.10.9 + - geos + - pip: + - earthkit-geo>=0.2.0 + - earthkit-meteo>=0.1.1 + - earthkit-plots>=0.2.4 + - earthkit-regrid>=0.3.4 + - earthkit-transforms>=0.3.4 diff --git a/pyproject.toml b/pyproject.toml index 02f845c..c41d7fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = [ "setuptools>=61", "setuptools-scm>=8" ] +requires = ["setuptools>=61", "setuptools-scm>=8"] [project] name = "earthkit" @@ -25,24 +25,24 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] -dynamic = [ "version" ] +dynamic = ["version"] dependencies = [ - "earthkit-data[all]>=0.10.2", + "earthkit-data[all]>=0.10.9", "earthkit-geo>=0.2", "earthkit-meteo>=0.1.1", - "earthkit-plots>=0.2", + "earthkit-plots>=0.2.4", "earthkit-regrid>=0.3.4", - "earthkit-transforms>=0.3.3", + "earthkit-transforms>=0.3.4", ] -optional-dependencies.test = [ "pytest" ] +optional-dependencies.test = ["pytest"] urls.Documentation = "https://earthkit.readthedocs.io/" urls.Homepage = "https://github.com/ecmwf/earthkit/" urls.Issues = "https://github.com/ecmwf/earthkit.issues" urls.Repository = "https://github.com/ecmwf/earthkit/" [tool.setuptools.packages.find] -include = [ "earthkit", "earthkit.*" ] -where = [ "src/", "./" ] +include = ["earthkit", "earthkit.*"] +where = ["src/", "./"] [tool.setuptools_scm] version_file = "src/earthkit/_version.py" @@ -54,5 +54,5 @@ profile = "black" branch = "true" [tool.pydocstyle] -add_ignore = [ "D1", "D200", "D205", "D400", "D401" ] +add_ignore = ["D1", "D200", "D205", "D400", "D401"] convention = "numpy" diff --git a/tests/environment-docs-tests.yml b/tests/environment-docs-tests.yml index 787e94f..fe9f9ec 100644 --- a/tests/environment-docs-tests.yml +++ b/tests/environment-docs-tests.yml @@ -1,14 +1,14 @@ name: earthkit channels: -- conda-forge -- nodefaults + - conda-forge + - nodefaults dependencies: -- pip -- sphinx -- sphinx-autoapi -- sphinx_rtd_theme -- sphinxcontrib-apidoc -- nbformat -- nbconvert -- nbsphinx -- ipykernel + - pip + - sphinx + - sphinx-autoapi + - sphinx_rtd_theme + - sphinxcontrib-apidoc + - nbformat + - nbconvert + - nbsphinx + - ipykernel diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 1d23f71..49ec0bc 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -1,16 +1,16 @@ name: earthkit channels: -- conda-forge -- nodefaults + - conda-forge + - nodefaults dependencies: -- pip -- pytest -- pytest-cov -- geos -- pip: - - earthkit-data[all]>=0.10.2 - - earthkit-geo>=0.2.0 - - earthkit-meteo>=0.1.1 - - earthkit-plots>=0.2.0 - - earthkit-regrid>=0.3.4 - - earthkit-transforms>=0.3.3 + - pip + - pytest + - pytest-cov + - geos + - pip: + - earthkit-data[all]>=0.10.9 + - earthkit-geo>=0.2.0 + - earthkit-meteo>=0.1.1 + - earthkit-plots>=0.2.4 + - earthkit-regrid>=0.3.4 + - earthkit-transforms>=0.3.4 From c6347eeacc39db47dfa958fcdd453adc9ae2d8a1 Mon Sep 17 00:00:00 2001 From: Sandor Kertesz Date: Fri, 1 Nov 2024 14:23:51 +0000 Subject: [PATCH 2/2] Update component versions --- environment.yml | 20 ++++++++++---------- pyproject.toml | 12 ++++++------ tests/environment-docs-tests.yml | 22 +++++++++++----------- tests/environment-unit-tests.yml | 26 +++++++++++++------------- 4 files changed, 40 insertions(+), 40 deletions(-) diff --git a/environment.yml b/environment.yml index da58a6f..f052238 100644 --- a/environment.yml +++ b/environment.yml @@ -1,13 +1,13 @@ name: earthkit channels: - - conda-forge - - nodefaults +- conda-forge +- nodefaults dependencies: - - earthkit-data>=0.10.9 - - geos - - pip: - - earthkit-geo>=0.2.0 - - earthkit-meteo>=0.1.1 - - earthkit-plots>=0.2.4 - - earthkit-regrid>=0.3.4 - - earthkit-transforms>=0.3.4 +- earthkit-data>=0.10.9 +- geos +- pip: + - earthkit-geo>=0.2.0 + - earthkit-meteo>=0.1.1 + - earthkit-plots>=0.2.4 + - earthkit-regrid>=0.3.4 + - earthkit-transforms>=0.3.4 diff --git a/pyproject.toml b/pyproject.toml index c41d7fe..0264710 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ["setuptools>=61", "setuptools-scm>=8"] +requires = [ "setuptools>=61", "setuptools-scm>=8" ] [project] name = "earthkit" @@ -25,7 +25,7 @@ classifiers = [ "Programming Language :: Python :: Implementation :: CPython", "Programming Language :: Python :: Implementation :: PyPy", ] -dynamic = ["version"] +dynamic = [ "version" ] dependencies = [ "earthkit-data[all]>=0.10.9", "earthkit-geo>=0.2", @@ -34,15 +34,15 @@ dependencies = [ "earthkit-regrid>=0.3.4", "earthkit-transforms>=0.3.4", ] -optional-dependencies.test = ["pytest"] +optional-dependencies.test = [ "pytest" ] urls.Documentation = "https://earthkit.readthedocs.io/" urls.Homepage = "https://github.com/ecmwf/earthkit/" urls.Issues = "https://github.com/ecmwf/earthkit.issues" urls.Repository = "https://github.com/ecmwf/earthkit/" [tool.setuptools.packages.find] -include = ["earthkit", "earthkit.*"] -where = ["src/", "./"] +include = [ "earthkit", "earthkit.*" ] +where = [ "src/", "./" ] [tool.setuptools_scm] version_file = "src/earthkit/_version.py" @@ -54,5 +54,5 @@ profile = "black" branch = "true" [tool.pydocstyle] -add_ignore = ["D1", "D200", "D205", "D400", "D401"] +add_ignore = [ "D1", "D200", "D205", "D400", "D401" ] convention = "numpy" diff --git a/tests/environment-docs-tests.yml b/tests/environment-docs-tests.yml index fe9f9ec..787e94f 100644 --- a/tests/environment-docs-tests.yml +++ b/tests/environment-docs-tests.yml @@ -1,14 +1,14 @@ name: earthkit channels: - - conda-forge - - nodefaults +- conda-forge +- nodefaults dependencies: - - pip - - sphinx - - sphinx-autoapi - - sphinx_rtd_theme - - sphinxcontrib-apidoc - - nbformat - - nbconvert - - nbsphinx - - ipykernel +- pip +- sphinx +- sphinx-autoapi +- sphinx_rtd_theme +- sphinxcontrib-apidoc +- nbformat +- nbconvert +- nbsphinx +- ipykernel diff --git a/tests/environment-unit-tests.yml b/tests/environment-unit-tests.yml index 49ec0bc..1708a27 100644 --- a/tests/environment-unit-tests.yml +++ b/tests/environment-unit-tests.yml @@ -1,16 +1,16 @@ name: earthkit channels: - - conda-forge - - nodefaults +- conda-forge +- nodefaults dependencies: - - pip - - pytest - - pytest-cov - - geos - - pip: - - earthkit-data[all]>=0.10.9 - - earthkit-geo>=0.2.0 - - earthkit-meteo>=0.1.1 - - earthkit-plots>=0.2.4 - - earthkit-regrid>=0.3.4 - - earthkit-transforms>=0.3.4 +- pip +- pytest +- pytest-cov +- geos +- pip: + - earthkit-data[all]>=0.10.9 + - earthkit-geo>=0.2.0 + - earthkit-meteo>=0.1.1 + - earthkit-plots>=0.2.4 + - earthkit-regrid>=0.3.4 + - earthkit-transforms>=0.3.4