Features/update tabular #335
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…perently prefers a value compared to nan and keeps it if it exists
Due to a pandas upgrade from version 1.1.5 to 2.0.3 there is an inaccuracy and the value only adds up to about one. For this reason pytest.approx is applied.
Due to a pandas upgrade from version 1.1.5 to 2.0.3, df.groupby(df.index.date)["sum UC work"].apply(lambda x: balance_between_hours(ts=x, start=WORK_START, end=WORK_END)) contains a MultiIndex. Due to this there is an error in the assignment to the dataframe df and np.nan values are entered. This can be fixed by using the values of the series.
After pandas upgrade from version 1.1.5 to 2.0.3
After upgrade of oemof.tabular the import of all component's classes via oemof.tabular.facades.Facade fails because facades is both a module and directory. To keep the check if component is a class in facades this work around has been invented
Due to oemof.solph upgrade es.timeincrement is set to a series. This series has to be resticted to 3 timesteps just as es.timeindex is.
…f-B3 into features/update_tabular
MaGering
requested changes
Sep 13, 2023
pyproject.toml
Outdated
| numpy = ">=1.21.0" | ||
| rtree = ">=0.9.7" | ||
| pyyaml = ">=6.0" | ||
| dynaconf = "^3.1.7" | ||
| snakemake = ">=5" | ||
| oemoflex = { git = "https://git@github.com/rl-institut/oemoflex", tag = "0.0.1"} | ||
| oemoflex = { git = "https://git@github.com/rl-institut/oemoflex", tag = "features/update_tabular"} |
There was a problem hiding this comment.
This needs to be updated as soon as oemoflex v0.0.2 is released.
| Sphinx = {version = "^4.3.2", optional = true} | ||
| sphinx-rtd-theme = {version = "^1.0.0", optional = true} | ||
| sphinxcontrib-bibtex = {version = "^2.4.1", optional = true} | ||
| docutils = "^0.17" | ||
| geopandas = {version = "^0.10.2", optional = true} | ||
| demandlib = "^0.1.8" | ||
| pandas = ">=1.1.0" | ||
| boto3 = "1.26.125" |
There was a problem hiding this comment.
Optional: Check if this can be dropped:
- Drop
- Execute
poetry lock - Revert in case poetry lock takes a disproportionately long time or other difficulties
- In case poetry lock file is build after a short while execute poetry install and test all important oemof-B3 functionalities
If this can't be done due to time constraints, move this to a issue with milestone v0.0.4.
There was a problem hiding this comment.
I dropped boto3 = "1.26.125". We had it because the log file would not been created without it. I tested it and the workflow runs normally without it.
MaGering
reviewed
Sep 20, 2023
MaGering
approved these changes
Sep 20, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #316
With this PR oemof-tabular is updated.