diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6bd0a992..3eed4fce3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -132,6 +132,7 @@ jobs: with: egress-policy: block allowed-endpoints: > + api.github.com:443 azure.archive.ubuntu.com:80 coveralls.io:443 esm.ubuntu.com:443 @@ -188,12 +189,15 @@ jobs: egress-policy: block allowed-endpoints: > api.github.com:443 + conda.anaconda.org:443 coveralls.io:443 + dap.service.does.not.exist:443 files.pythonhosted.org:443 github.com:443 objects.githubusercontent.com:443 pypi.org:443 raw.githubusercontent.com:443 + repo.anaconda.com:443 - uses: actions/checkout@v4.1.1 - name: Setup Conda (Micromamba) with Python${{ matrix.python-version }} uses: mamba-org/setup-micromamba@v1.7.3 diff --git a/CHANGES.rst b/CHANGES.rst index 493b67347..604c4913e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -22,6 +22,7 @@ Breaking changes ^^^^^^^^^^^^^^^^ * `bump2version` has been replaced with `bump-my-version` to bump the version number using configurations set in the `pyproject.toml` file. (:issue:`1557`, :pull:`1569`). * `xclim`'s units registry and units formatting are now extended from `cf-xarray`. The exponent sign "^" is now never added in the ``units`` attribute. For example, square meters are given as "m2" instead of "m^2" by xclim, both are still accepted as input. (:issue:`1010`, :pull:`1590`). +* `yamale` is now listed as a core dependency (was previously listed in the `dev` installation recipe). (:issue:`1595`, :pull:`1596`). Bug fixes ^^^^^^^^^ diff --git a/environment.yml b/environment.yml index 9ad2acd11..04ae0e482 100644 --- a/environment.yml +++ b/environment.yml @@ -24,6 +24,7 @@ dependencies: - scipy >=1.2 - statsmodels - xarray >=2022.06.0,<2023.11.0 + - yamale # Extras - eofs - flox @@ -70,7 +71,6 @@ dependencies: - tox # - tox-conda # Will be added when a tox@v4.0+ compatible plugin is released. - xdoctest - - yamale - yamllint - pip - pip: diff --git a/pyproject.toml b/pyproject.toml index 75545c2d8..267916710 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,8 @@ dependencies = [ "scikit-learn>=0.21.3", "scipy>=1.2", "statsmodels", - "xarray>=2022.06.0,<2023.11.0" + "xarray>=2022.06.0,<2023.11.0", + "yamale" ] [project.optional-dependencies] @@ -84,7 +85,6 @@ dev = [ "tox", # "tox-conda", # Will be added when a tox@v4.0+ compatible plugin is released. "xdoctest", - "yamale", "yamllint", # Documentation and examples "distributed >=2.0",