Resolved conflict with packages

[GbotemiB]

Closes 936# (if applicable).

Changes proposed in this Pull Request

This PR suggests a fix for the environment file due to the recent update with earth-osm.

Checklist

• I consent to the release of this PR's code under the AGPLv3 license and non-code contributions under CC0-1.0 and CC-BY-4.0.
• I tested my contribution locally and it seems to work fine.
• Code and workflow changes are sufficiently documented.
• Newly introduced dependencies are added to envs/environment.yaml and doc/requirements.txt.
• Changes in configuration options are added in all of config.default.yaml and config.tutorial.yaml.
• Add a test config or line additions to test/ (note tests are changing the config.tutorial.yaml)
• Changes in configuration options are also documented in doc/configtables/*.csv and line references are adjusted in doc/configuration.rst and doc/tutorial.rst.
• A note for the release notes doc/release_notes.rst is amended in the format of previous release notes, including reference to the requested PR.

[davide-f]

Mmm nice to fix the issue!
As a comment, maybe the function has changed name, could you check:
https://github.com/pypsa-meets-earth/earth-osm/blob/714ab0d9762d3715fdd1ebb1eba6af1773070004/earth_osm/eo.py#L122

[davide-f]

Hello @GbotemiB!
I investigated the problem and completely agree that a quick fix is recommended.
Please, could you:

• revert the change in the file environment.fixed: never edit that file during PRs, it is only updated after a new version
• please, instead of fiing the xarray with ==, please use "<=". Is that fix necessary?

Once that is done, we can merge this PR :)

When do you think you could do this?
Unfortunately I may need this today but I could step in if you agree

[davide-f]

As discussed

[GbotemiB]

Hello @GbotemiB! I investigated the problem and completely agree that a quick fix is recommended. Please, could you:

• revert the change in the file environment.fixed: never edit that file during PRs, it is only updated after a new version
• please, instead of fiing the xarray with ==, please use "<=". Is that fix necessary?

Once that is done, we can merge this PR :)

When do you think you could do this? Unfortunately I may need this today but I could step in if you agree

Thanks @davide-f, I will make the changes as soon as possible.

[GbotemiB]

Hello @davide-f, I have reviewed the yaml files.

[GbotemiB]

I have also reset, the history to make it cleaner. If you need to make additional changes before merging, please feel free to.

Thanks @davide-f.