Dev - Githubissues

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.

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.

vergauwenthomas / MetObs_toolkit

Dev #421