Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #421

Merged
merged 136 commits into from
Jan 25, 2024
Merged

Dev #421

merged 136 commits into from
Jan 25, 2024

Conversation

vergauwenthomas
Copy link
Owner

No description provided.

vergauwenthomas and others added 30 commits July 26, 2023 17:46
* * add Siebe dataset to testing framework
* fixed bug so that outliers in combined df are in obs time frequency
* add obstype in qc plot title
* fixed bug that qc settings can be update on non existing default obstypes
* extended function to check if a qc can be applied to check if all required settings are available.

* fixed docstring

* build on dev branch
* add titanlib in extension group

* add documentation + catchers if titanlib is not installed

* add all extras in the github actions

* less restrictive on titanlib version

* upgrade titanversion
* include options in template

* some minor fixes and tests

* update the tests

* update docs

* code cleanup
… the gee interactive plot (needed by the GUI)
vergauwenthomas and others added 12 commits September 5, 2023 11:57
* setup a os matrix for pip install testing of the metobs toolkit

* remove trigger of branch soon to be deleted
* start of the obervation type module

* framework for the obstypeclass in the Dataset

* fixed implementation of obstype class and test are succesfull

* add test for new observation and new units

* obstype framework now extended to modeldata

* documentation and addition of modelobstype and modelobstype_vectorfields + multi bandname extraction of gee

* minor code review fixes

* fixes of codereview

* update the template prompter to create new obstypes/units

* bug fixes in template prompt helper

* new build

* better naming of variable in the documentation examples

* fixed current functions for vector observation types

* extend the modelobstype classes with required methods

* Update test with new observation types etc

* update version

* fix interpolation of and import from csv for multi obs for modeldata

* bugfix in ylabel representatio

* update tests

* use rtd theme
* add interactive and time evolution folium plot

* cleanup
Updated standard name for 'wind speed' i.e, wind_speed in docs.
@vergauwenthomas vergauwenthomas added this to the v0.1.3 milestone Jan 24, 2024
@vergauwenthomas vergauwenthomas self-assigned this Jan 24, 2024
README.md Outdated Show resolved Hide resolved
examples/Gap_filling_excercise_03.ipynb Show resolved Hide resolved
examples/Introduction_01.ipynb Outdated Show resolved Hide resolved
examples/Quality_control_excercise_02.ipynb Outdated Show resolved Hide resolved
examples/Urban_analysis_excercise_04.ipynb Show resolved Hide resolved
metobs_toolkit/settings_files/alaro_25_settings.py Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
pyproject.toml Outdated Show resolved Hide resolved
tests/test_data/delete_me.csv Outdated Show resolved Hide resolved
metobs_toolkit/modeldata.py Outdated Show resolved Hide resolved
@vergauwenthomas
Copy link
Owner Author

Backup, fixing merge conflics:

CONFLICT (add/add): Merge conflict in tests/test_data/single_station_template_with_options.csv
Auto-merging tests/test_data/single_station_template_with_options.csv
Auto-merging tests/push_test/modeldata_test.py
Auto-merging tests/push_test/gap_and_fill_test.py
Auto-merging tests/push_test/IO_test.py
CONFLICT (content): Merge conflict in tests/push_test/IO_test.py
CONFLICT (modify/delete): requirements.txt deleted in master and modified in HEAD. Version HEAD of requirements.txt left in tree.
Auto-merging pyproject.toml
CONFLICT (content): Merge conflict in pyproject.toml
CONFLICT (modify/delete): poetry.lock deleted in master and modified in HEAD. Version HEAD of poetry.lock left in tree.
Auto-merging metobs_toolkit/station.py
CONFLICT (content): Merge conflict in metobs_toolkit/station.py
Auto-merging metobs_toolkit/qc_checks.py
CONFLICT (content): Merge conflict in metobs_toolkit/qc_checks.py
Auto-merging metobs_toolkit/printing.py
Auto-merging metobs_toolkit/plotting_functions.py
CONFLICT (content): Merge conflict in metobs_toolkit/plotting_functions.py
Auto-merging metobs_toolkit/modeldata.py
CONFLICT (content): Merge conflict in metobs_toolkit/modeldata.py
Auto-merging metobs_toolkit/missingobs.py
CONFLICT (content): Merge conflict in metobs_toolkit/missingobs.py
Auto-merging metobs_toolkit/landcover_functions.py
CONFLICT (content): Merge conflict in metobs_toolkit/landcover_functions.py
Auto-merging metobs_toolkit/gap.py
CONFLICT (content): Merge conflict in metobs_toolkit/gap.py
Auto-merging metobs_toolkit/df_helpers.py
CONFLICT (content): Merge conflict in metobs_toolkit/df_helpers.py
Auto-merging metobs_toolkit/dataset_settings_updater.py
CONFLICT (content): Merge conflict in metobs_toolkit/dataset_settings_updater.py
Auto-merging metobs_toolkit/dataset.py
CONFLICT (content): Merge conflict in metobs_toolkit/dataset.py
Auto-merging metobs_toolkit/data_templates/template_defaults/default_template.csv
CONFLICT (content): Merge conflict in metobs_toolkit/data_templates/template_defaults/default_template.csv
Auto-merging metobs_toolkit/data_templates/template_build_prompt.py
CONFLICT (content): Merge conflict in metobs_toolkit/data_templates/template_build_prompt.py
Auto-merging metobs_toolkit/data_import.py
CONFLICT (content): Merge conflict in metobs_toolkit/data_import.py
CONFLICT (modify/delete): metobs_toolkit/convertors.py deleted in HEAD and modified in master. Version master of metobs_toolkit/convertors.py left in tree.
Auto-merging metobs_toolkit/analysis.py
Auto-merging metobs_toolkit/init.py
CONFLICT (content): Merge conflict in metobs_toolkit/init.py
Removing examples/testdata.csv
Removing examples/qualitycontrol_example.py
Removing examples/plotting_example.py
Removing examples/metadata_file.csv
Removing examples/lcz_example.py
CONFLICT (modify/delete): examples/introduction_example.py deleted in master and modified in HEAD. Version HEAD of examples/introduction_example.py left in tree.
Removing examples/filling_example.py
Auto-merging docs/intro.rst
CONFLICT (content): Merge conflict in docs/intro.rst
Removing docs/examples.rst
Auto-merging docs/conf.py
CONFLICT (content): Merge conflict in docs/conf.py
Auto-merging deploiment/build_and_test.sh
CONFLICT (content): Merge conflict in deploiment/build_and_test.sh
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Auto-merging LICENSE
CONFLICT (content): Merge conflict in LICENSE
Auto-merging .gitignore
CONFLICT (content): Merge conflict in .gitignore
CONFLICT (modify/delete): .github/workflows/master_test.yml deleted in master and modified in HEAD. Version HEAD of .github/workflows/master_test.yml left in tree.
CONFLICT (modify/delete): .github/workflows/build_and_deploy_doc.yml deleted in master and modified in HEAD. Version HEAD of .github/workflows/build_and_deploy_doc.yml left in tree.
Automatic merge failed; fix conflicts and then commit the result.

@vergauwenthomas
Copy link
Owner Author

vergauwenthomas commented Jan 25, 2024

  • Get rid of the world boundaries settings files
  • Fix the paper pdf creator action

vergauwenthomas and others added 3 commits January 25, 2024 13:55
* replace world boundaries files by using cartopy package

* fix test

* Saved new PDF of paper

---------

Co-authored-by: vergauwenthomas <[email protected]>
* Saved new PDF of paper

* added an ran pre-commit

* Saved new PDF of paper

* install pre-commit format for toml file

* added flake and toml checks to pre-commit

* run flake8

* Saved new PDF of paper

* formatted wit flake

* Saved new PDF of paper

---------

Co-authored-by: vergauwenthomas <[email protected]>
@vergauwenthomas
Copy link
Owner Author

Test fails on installing cartopy:

  running build_ext
  building 'cartopy.trace' extension
  creating build/temp.linux-x86_64-cpython-39
  creating build/temp.linux-x86_64-cpython-39/lib
  creating build/temp.linux-x86_64-cpython-39/lib/cartopy
  gcc -Wno-unused-result -Wsign-compare -DNDEBUG -g -fwrapv -O3 -Wall -fPIC -I/opt/hostedtoolcache/Python/3.9.18/x64/include -I./lib/cartopy -I/tmp/tmp5zntequb/.venv/lib/python3.9/site-packages/numpy/core/include -I/tmp/tmp5zntequb/.venv/include -I/opt/hostedtoolcache/Python/3.9.18/x64/include/python3.9 -c lib/cartopy/trace.cpp -o build/temp.linux-x86_64-cpython-39/lib/cartopy/trace.o
  lib/cartopy/trace.cpp:767:10: fatal error: geos_c.h: No such file or directory
    767 | #include "geos_c.h"
        |          ^~~~~~~~~~
  compilation terminated.
  error: command '/usr/bin/gcc' failed with exit code 1
  

  at /opt/hostedtoolcache/Python/3.9.18/x64/lib/python3.9/site-packages/poetry/installation/chef.py:164 in _prepare
      160│ 
      161│                 error = ChefBuildError("\n\n".join(message_parts))
      162│ 
      163│             if error is not None:
    → 164│                 raise error from None
      165│ 
      166│             return path
      167│ 
      168│     def _prepare_sdist(self, archive: Path, destination: Path | None = None) -> Path:

Note: This error originates from the build backend, and is likely not a problem with poetry but with cartopy (0.21.1) not supporting PEP 517 builds. You can verify this by running 'pip wheel --no-cache-dir --use-pep517 "cartopy (==0.21.1)"'
```.

Using  'pip wheel --no-cache-dir --use-pep517 "cartopy (==0.21.1)" installs cartopy correctly. 

* add geos to dep test

* Saved new PDF of paper

* change cartopy version

* Saved new PDF of paper

* add shapley and pygeos versions explicitly to pyproject

* Saved new PDF of paper

* add xarray

* Saved new PDF of paper

* rely on xarray for cartopy

* Saved new PDF of paper

* test geos dep

* Saved new PDF of paper

---------

Co-authored-by: vergauwenthomas <[email protected]>
@vergauwenthomas vergauwenthomas merged commit 62f5559 into master Jan 25, 2024
17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants