Просмотр исходного кода

Merge remote-tracking branch 'refs/remotes/origin/main' into mongolia-BUR2-remaining-tables

# Conflicts:
#	poetry.lock
#	pyproject.toml
#	src/unfccc_ghg_data/unfccc_reader/Mongolia/read_MNG_BUR2_from_pdf.py
Daniel Busch 9 месяцев назад
Родитель
Сommit
8a162e9aa8
100 измененных файлов с 593 добавлено и 370 удалено
  1. 95 95
      .github/workflows/ci.yaml
  2. 1 0
      .gitignore
  3. 2 1
      .pre-commit-config.yaml
  4. 0 1
      LICENCE
  5. 3 3
      README.md
  6. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.csv
  7. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.nc
  8. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.yaml
  9. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.csv
  10. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.nc
  11. 42 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.yaml
  12. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.csv
  13. 1 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.nc
  14. 42 0
      datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.yaml
  15. 0 6
      docs/source/api/unfccc_ghg_data.helper.country_info.rst
  16. 18 0
      docs/source/api/unfccc_ghg_data.helper.functions.rst
  17. 0 25
      docs/source/api/unfccc_ghg_data.helper.functions_temp.rst
  18. 0 2
      docs/source/api/unfccc_ghg_data.helper.rst
  19. 6 0
      docs/source/api/unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crt1_specification.rst
  20. 1 0
      docs/source/api/unfccc_ghg_data.unfccc_crf_reader.crf_specifications.rst
  21. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year_datalad.rst
  22. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission_datalad.rst
  23. 0 2
      docs/source/api/unfccc_ghg_data.unfccc_crf_reader.rst
  24. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_datalad.rst
  25. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group_datalad.rst
  26. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_datalad.rst
  27. 0 6
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group_datalad.rst
  28. 0 4
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.rst
  29. 6 0
      docs/source/api/unfccc_ghg_data.unfccc_di_reader.unfccc_di_reader_core.rst
  30. 211 192
      dodo.py
  31. 1 0
      downloaded_data/UNFCCC/00_new_downloads_BTR1-2024-06-24.csv
  32. 1 0
      downloaded_data/UNFCCC/00_new_downloads_BUR-2024-05-27.csv
  33. 1 0
      downloaded_data/UNFCCC/00_new_downloads_BUR-2024-06-24.csv
  34. 1 0
      downloaded_data/UNFCCC/00_new_downloads_CRF2023-2024-05-22.csv
  35. 1 0
      downloaded_data/UNFCCC/00_new_downloads_NC-2024-06-24.csv
  36. 1 0
      downloaded_data/UNFCCC/Cabo_Verde/BUR1/BUR_EN_Digital.pdf
  37. 1 0
      downloaded_data/UNFCCC/China/BUR3/China_BUR3_Chinese.pdf
  38. 1 0
      downloaded_data/UNFCCC/China/BUR3/China_BUR3_English.pdf
  39. 1 0
      downloaded_data/UNFCCC/Ethiopia/BUR1/Ethiopia_First_BUR.pdf
  40. 1 0
      downloaded_data/UNFCCC/Ethiopia/NC3/Ethiopia_Revised_third_NC.pdf
  41. 1 0
      downloaded_data/UNFCCC/Fiji/BUR1/Fiji_GHG_NIR_2023_Final.pdf
  42. 1 0
      downloaded_data/UNFCCC/United_Arab_Emirates/BUR1/all_data_manual.csv
  43. 1 0
      downloaded_data/UNFCCC/United_Arab_Emirates/BUR1/tables_manual.ods
  44. 1 1
      downloaded_data/UNFCCC/submissions-annexI_2023.csv
  45. 1 1
      downloaded_data/UNFCCC/submissions-bur.csv
  46. 1 1
      downloaded_data/UNFCCC/submissions-nc.csv
  47. 1 0
      extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.csv
  48. 1 0
      extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.nc
  49. 1 0
      extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.yaml
  50. 1 0
      extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.csv
  51. 1 0
      extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.nc
  52. 1 0
      extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.yaml
  53. 1 0
      extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.csv
  54. 1 0
      extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.nc
  55. 33 0
      extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.yaml
  56. 1 0
      extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.csv
  57. 1 0
      extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.nc
  58. 1 0
      extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.yaml
  59. 1 0
      extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.csv
  60. 1 0
      extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.nc
  61. 1 0
      extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.yaml
  62. 1 0
      extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.csv
  63. 1 0
      extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.nc
  64. 1 0
      extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.yaml
  65. 1 0
      extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.csv
  66. 1 0
      extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.nc
  67. 1 0
      extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.yaml
  68. 1 0
      extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.csv
  69. 1 0
      extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.nc
  70. 1 0
      extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.yaml
  71. 1 0
      extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.csv
  72. 1 0
      extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.nc
  73. 26 0
      extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.yaml
  74. 1 0
      extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.csv
  75. 1 0
      extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.nc
  76. 1 0
      extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.yaml
  77. 1 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.csv
  78. 1 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.nc
  79. 1 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.yaml
  80. 1 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.csv
  81. 1 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.nc
  82. 33 0
      extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.yaml
  83. 1 0
      extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.csv
  84. 1 0
      extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.nc
  85. 1 0
      extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.yaml
  86. 1 0
      extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.csv
  87. 1 0
      extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.nc
  88. 1 0
      extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.yaml
  89. 1 0
      extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.csv
  90. 1 0
      extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.nc
  91. 1 0
      extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.yaml
  92. 1 0
      extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.csv
  93. 1 0
      extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.nc
  94. 1 0
      extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.yaml
  95. 1 0
      extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.csv
  96. 1 0
      extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.nc
  97. 1 0
      extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.yaml
  98. 1 0
      extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.csv
  99. 1 0
      extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.nc
  100. 1 0
      extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.yaml

+ 95 - 95
.github/workflows/ci.yaml

@@ -7,20 +7,20 @@ on:
     tags: ['v*']
 
 jobs:
-  mypy:
-    if: ${{ !github.event.pull_request.draft }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-        with:
-          os: "ubuntu-latest"
-          python-version: "3.9"
-          venv-id: "docs"
-          poetry-dependency-install-flags: "--all-extras --only 'main,dev'"
-      - name: mypy
-        run: MYPYPATH=stubs poetry run mypy src
+#  mypy:
+#    if: ${{ !github.event.pull_request.draft }}
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v3
+#      - uses: ./.github/actions/setup
+#        with:
+#          os: "ubuntu-latest"
+#          python-version: "3.9"
+#          venv-id: "docs"
+#          poetry-dependency-install-flags: "--all-extras --only 'main,dev'"
+#      - name: mypy
+#        run: MYPYPATH=stubs poetry run mypy src
 
   docs:
     if: ${{ !github.event.pull_request.draft }}
@@ -37,87 +37,87 @@ jobs:
       - name: docs
         run: poetry run sphinx-build -W --keep-going -T -b html docs/source docs/build
 
-  tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ "ubuntu-latest" ]
-        python-version: [ "3.9", "3.10", "3.11" ]
-    runs-on: "${{ matrix.os }}"
-    defaults:
-      run:
-        # This might be needed for Windows and doesn't seem to affect unix-based systems
-        # so we include it. If you have better proof of whether this is needed or not,
-        # feel free to update.
-        shell: bash
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-        with:
-          os: "${{ matrix.os }}"
-          python-version: "${{ matrix.python-version }}"
-          venv-id: "tests-${{ runner.os }}"
-          poetry-dependency-install-flags: "--all-extras"
-      - name: Run tests
-        run: |
-          poetry run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml
-          poetry run coverage report
-      - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v3
+#  tests:
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        os: [ "ubuntu-latest" ]
+#        python-version: [ "3.9", "3.10", "3.11" ]
+#    runs-on: "${{ matrix.os }}"
+#    defaults:
+#      run:
+#        # This might be needed for Windows and doesn't seem to affect unix-based systems
+#        # so we include it. If you have better proof of whether this is needed or not,
+#        # feel free to update.
+#        shell: bash
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v3
+#      - uses: ./.github/actions/setup
+#        with:
+#          os: "${{ matrix.os }}"
+#          python-version: "${{ matrix.python-version }}"
+#          venv-id: "tests-${{ runner.os }}"
+#          poetry-dependency-install-flags: "--all-extras"
+#      - name: Run tests
+#        run: |
+#          poetry run pytest -r a -v src tests --doctest-modules --cov=src --cov-report=term-missing --cov-report=xml
+#          poetry run coverage report
+#      - name: Upload coverage reports to Codecov
+#        uses: codecov/codecov-action@v3
 
-  imports-without-extras:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ "ubuntu-latest" ]
-        python-version: [ "3.9", "3.10", "3.11" ]
-    runs-on: "${{ matrix.os }}"
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-        with:
-          python-version: "${{ matrix.python-version }}"
-          venv-id: "imports-without-extras-${{ runner.os }}"
-          poetry-dependency-install-flags: "--only main"
-      - name: Check importable without extras
-        run: poetry run python scripts/test-install.py
+#  imports-without-extras:
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        os: [ "ubuntu-latest" ]
+#        python-version: [ "3.9", "3.10", "3.11" ]
+#    runs-on: "${{ matrix.os }}"
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v3
+#      - uses: ./.github/actions/setup
+#        with:
+#          python-version: "${{ matrix.python-version }}"
+#          venv-id: "imports-without-extras-${{ runner.os }}"
+#          poetry-dependency-install-flags: "--only main"
+#      - name: Check importable without extras
+#        run: poetry run python scripts/test-install.py
+#
+#  check-build:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v3
+#      - uses: ./.github/actions/setup
+#        with:
+#          python-version: "3.9"
+#          venv-id: "check-build-${{ runner.os }}"
+#          run-poetry-install: false
+#          poetry-dependency-install-flags: "not used"
+#      - name: Build package
+#        run: |
+#          poetry build --no-interaction
+#      - name: Check build
+#        run: |
+#          tar -tvf dist/unfccc_ghg_data-*.tar.gz --wildcards '*unfccc_ghg_data/py.typed'
+#          tar -tvf dist/unfccc_ghg_data-*.tar.gz --wildcards 'unfccc_ghg_data-*/LICENCE'
 
-  check-build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-        with:
-          python-version: "3.9"
-          venv-id: "check-build-${{ runner.os }}"
-          run-poetry-install: false
-          poetry-dependency-install-flags: "not used"
-      - name: Build package
-        run: |
-          poetry build --no-interaction
-      - name: Check build
-        run: |
-          tar -tvf dist/unfccc_ghg_data-*.tar.gz --wildcards '*unfccc_ghg_data/py.typed'
-          tar -tvf dist/unfccc_ghg_data-*.tar.gz --wildcards 'unfccc_ghg_data-*/LICENCE'
 
-
-  check-dependency-licences:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v3
-      - uses: ./.github/actions/setup
-        with:
-          python-version: "3.9"
-          venv-id: "licence-check"
-          poetry-dependency-install-flags: "--all-extras"
-      - name: Check licences of dependencies
-        shell: bash
-        run: |
-          TEMP_FILE=$(mktemp)
-          poetry export --without=tests --without=docs --without=dev > $TEMP_FILE
-          poetry run liccheck -r $TEMP_FILE -R licence-check.txt
-          cat licence-check.txt
+#  check-dependency-licences:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - name: Check out repository
+#        uses: actions/checkout@v3
+#      - uses: ./.github/actions/setup
+#        with:
+#          python-version: "3.9"
+#          venv-id: "licence-check"
+#          poetry-dependency-install-flags: "--all-extras"
+#      - name: Check licences of dependencies
+#        shell: bash
+#        run: |
+#          TEMP_FILE=$(mktemp)
+#          poetry export --without=tests --without=docs --without=dev > $TEMP_FILE
+#          poetry run liccheck -r $TEMP_FILE -R licence-check.txt
+#          cat licence-check.txt

+ 1 - 0
.gitignore

@@ -158,3 +158,4 @@ dmypy.json
 
 # Mac stuff
 *.DS_Store
+/stubs/xarray/

+ 2 - 1
.pre-commit-config.yaml

@@ -19,10 +19,11 @@ repos:
       - id: debug-statements
       - id: detect-private-key
       - id: end-of-file-fixer
-        exclude: ".json"
+        exclude: ".json|.yaml"
       - id: fix-byte-order-marker
       - id: mixed-line-ending
       - id: trailing-whitespace
+        exclude: ".json|.yaml"
   - repo: local
     hooks:
       # Prevent committing .rej files

+ 0 - 1
LICENCE

@@ -1 +0,0 @@
-To be decided by project implementer

+ 3 - 3
README.md

@@ -124,9 +124,9 @@ The code has not been tested under Windows and Mac OS.
 ### Update BUR, NC, and NDC submissions
 The maintainers of this repository will update the list of submissions and the downloaded pdf files frequently. However, in some cases you might want to have the data early and do the download yourself. To avoid merge conflicts, please do this on a clean branch in your fork and make sure your branch is in sync with `main`.
 
-* **BUR**: To update the list of submissions run `make update-bur` in the main project folder. This will create a new list of submissions. To actually download the files run `make download-bur`.
-* **NC**: To update the list of submissions run `make update-nc` in the main project folder. This will create a new list of submissions. To actually download the files run `make download-nc`.
-* **NDC**: For the NDC submissions we use the list published in [openclimatedata/ndcs](https://github.com/openclimatedata/ndcs) which receives daily updates. To  download the files run `make download-ndc`.
+* **BUR**: To update the list of submissions run `poetry run doit update_bur` in the main project folder. This will create a new list of submissions. To actually download the files run `poetry run doit  download_bur`.
+* **NC**: To update the list of submissions run `poetry run doit update_nc` in the main project folder. This will create a new list of submissions. To actually download the files run `poetry run doit download_nc`.
+* **NDC**: For the NDC submissions we use the list published in [openclimatedata/ndcs](https://github.com/openclimatedata/ndcs) which receives daily updates. To  download the files run `poetry run doit download_ndc` (currently not working due to a data format change).
 
 All download scripts create files listing the new downloads in the folder *downloaded_data/UNFCCC*. the filenames use the format *00\_new\_downloads\_\<type\>-YYYY-MM-DD.csv* where *\<type\>* is *bur*, *nc*, or *ndc*. Currently, only one file per type and day is stored, so if you run the download script more than once on a day you will overwrite your first file (likely with an empty file as you have already downloaded everything) (see also [issue #2](https://github.com/JGuetschow/UNFCCC_non-AnnexI_data/issues/2)).
 

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.csv

@@ -0,0 +1 @@
+DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.nc

@@ -0,0 +1 @@
+DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.nc

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_2024-06-24.yaml

@@ -0,0 +1 @@
+DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.yaml

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/90/zv/MD5E-s14752613--037cf6569f6abc10f76bf16738344eb1.csv/MD5E-s14752613--037cf6569f6abc10f76bf16738344eb1.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/4m/6m/MD5E-s6240934--e0780dcc3980eb97a42387738f18d409.nc/MD5E-s6240934--e0780dcc3980eb97a42387738f18d409.nc

+ 42 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.yaml

@@ -0,0 +1,42 @@
+attrs:
+  references: https://di.unfccc.int
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Process_Date)
+  sec_cats:
+  - class
+  - measure
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2024-06-24
+  title: 'Data submitted by the following non-AnnexI countries and available in the
+    DI interface, converted to IPCC2006 categories and downscaled where applicable.
+    For download date see scenario. Countries: AFG, AGO, ALB, ARE, ARG, ARM, ATG,
+    AZE, BDI, BEN, BFA, BGD, BHR, BHS, BIH, BLZ, BOL, BRA, BRB, BRN, BTN, BWA, CAF,
+    CHL, CHN, CIV, CMR, COD, COG, COK, COL, COM, CPV, CRI, DJI, DMA, DOM, DZA, ECU,
+    EGY, ERI, ETH, FJI, FSM, GAB, GEO, GHA, GIN, GMB, GNB, GRD, GTM, GUY, HND, HTI,
+    IDN, IND, IRN, IRQ, ISR, JAM, JOR, KEN, KGZ, KHM, KIR, KNA, KOR, KWT, LAO, LBN,
+    LBR, LCA, LKA, LSO, MAR, MDA, MDG, MDV, MEX, MHL, MKD, MLI, MMR, MNE, MNG, MOZ,
+    MRT, MUS, MWI, MYS, NAM, NER, NGA, NIC, NIU, NPL, NRU, OMN, PAK, PAN, PER, PHL,
+    PLW, PNG, PRK, PRY, PSE, QAT, RWA, SAU, SDN, SEN, SGP, SLB, SLV, SMR, SRB, SSD,
+    STP, SUR, SWZ, SYC, SYR, TCD, TGO, THA, TJK, TKM, TLS, TON, TTO, TUN, TUV, TZA,
+    UGA, URY, UZB, VCT, VEN, VNM, VUT, WSM, YEM, ZAF, ZMB, ZWE'
+  entity: UnspMixOfPFCs
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Process_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: DI_non_AnnexI_5b4bd6d252f09118c7bf1c56cc572520_hash.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/9G/JZ/MD5E-s14519044--77fda5a5230b4e32569ded634b4931d0.csv/MD5E-s14519044--77fda5a5230b4e32569ded634b4931d0.csv

+ 1 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/g6/fw/MD5E-s5457126--a8cbe922f6ae6ab9a0961558f3ee0602.nc/MD5E-s5457126--a8cbe922f6ae6ab9a0961558f3ee0602.nc

+ 42 - 0
datasets/UNFCCC/DI_non_AnnexI/DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.yaml

@@ -0,0 +1,42 @@
+attrs:
+  references: https://di.unfccc.int
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Process_Date)
+  sec_cats:
+  - class
+  - measure
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2024-06-24
+  entity: UnspMixOfPFCs
+  title: 'Data submitted by the following non-AnnexI countries and available in the
+    DI interface, converted to IPCC2006 categories and downscaled where applicable.
+    For download date see scenario. Countries: AFG, AGO, ALB, ARE, ARG, ARM, ATG,
+    AZE, BDI, BEN, BFA, BGD, BHR, BHS, BOL, BRA, BRB, BRN, BTN, BWA, CAF, CHL, CHN,
+    CIV, CMR, COD, COG, COK, COL, COM, CPV, CRI, DJI, DMA, DOM, DZA, ECU, EGY, ERI,
+    ETH, FJI, FSM, GAB, GEO, GHA, GIN, GMB, GNB, GRD, GTM, GUY, HND, HTI, IDN, IND,
+    IRN, IRQ, ISR, JAM, JOR, KEN, KGZ, KHM, KIR, KNA, KOR, KWT, LAO, LBN, LBR, LCA,
+    LKA, LSO, MAR, MDA, MDG, MDV, MEX, MHL, MKD, MLI, MMR, MNE, MNG, MOZ, MRT, MUS,
+    MWI, MYS, NAM, NER, NGA, NIC, NIU, NPL, NRU, OMN, PAK, PAN, PER, PHL, PLW, PNG,
+    PRK, PRY, PSE, QAT, RWA, SAU, SDN, SEN, SGP, SLB, SLV, SMR, SRB, SSD, SUR, SWZ,
+    SYC, SYR, TCD, TGO, THA, TJK, TKM, TLS, TON, TTO, TUN, TUV, TZA, UGA, URY, UZB,
+    VCT, VEN, VNM, VUT, WSM, YEM, ZAF, ZMB, ZWE'
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Process_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: DI_non_AnnexI_b8c8b0f42383cf57ef7096253fbba61f_hash.csv

+ 0 - 6
docs/source/api/unfccc_ghg_data.helper.country_info.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.helper.country\_info
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.helper.country_info
-
-.. currentmodule:: unfccc_ghg_data.helper.country_info

+ 18 - 0
docs/source/api/unfccc_ghg_data.helper.functions.rst

@@ -65,3 +65,21 @@ make\_wide\_table
 =================
 
 .. autofunction:: make_wide_table
+
+
+find\_and\_replace\_values
+==========================
+
+.. autofunction:: find_and_replace_values
+
+
+assert\_values
+==============
+
+.. autofunction:: assert_values
+
+
+assert\_nan\_values
+===================
+
+.. autofunction:: assert_nan_values

+ 0 - 25
docs/source/api/unfccc_ghg_data.helper.functions_temp.rst

@@ -1,25 +0,0 @@
-unfccc\_ghg\_data.helper.functions\_temp
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.helper.functions_temp
-
-.. currentmodule:: unfccc_ghg_data.helper.functions_temp
-
-
-
-find\_and\_replace\_values
-==========================
-
-.. autofunction:: find_and_replace_values
-
-
-assert\_values
-==============
-
-.. autofunction:: assert_values
-
-
-assert\_nan\_values
-===================
-
-.. autofunction:: assert_nan_values

+ 0 - 2
docs/source/api/unfccc_ghg_data.helper.rst

@@ -9,8 +9,6 @@ unfccc\_ghg\_data.helper
 .. autosummary::
   :toctree: ./
 
-  unfccc_ghg_data.helper.country_info
   unfccc_ghg_data.helper.definitions
   unfccc_ghg_data.helper.folder_mapping
   unfccc_ghg_data.helper.functions
-  unfccc_ghg_data.helper.functions_temp

+ 6 - 0
docs/source/api/unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crt1_specification.rst

@@ -0,0 +1,6 @@
+unfccc\_ghg\_data.unfccc\_crf\_reader.crf\_specifications.crt1\_specification
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. automodule:: unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crt1_specification
+
+.. currentmodule:: unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crt1_specification

+ 1 - 0
docs/source/api/unfccc_ghg_data.unfccc_crf_reader.crf_specifications.rst

@@ -13,4 +13,5 @@ unfccc\_ghg\_data.unfccc\_crf\_reader.crf\_specifications
   unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crf2022_specification
   unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crf2023_aus_specification
   unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crf2023_specification
+  unfccc_ghg_data.unfccc_crf_reader.crf_specifications.crt1_specification
   unfccc_ghg_data.unfccc_crf_reader.crf_specifications.util

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_crf\_reader.read\_new\_unfccc\_crf\_for\_year\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year_datalad

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_crf\_reader.read\_unfccc\_crf\_submission\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission_datalad

+ 0 - 2
docs/source/api/unfccc_ghg_data.unfccc_crf_reader.rst

@@ -12,9 +12,7 @@ unfccc\_ghg\_data.unfccc\_crf\_reader
   unfccc_ghg_data.unfccc_crf_reader.crf_raw_for_year
   unfccc_ghg_data.unfccc_crf_reader.crf_specifications
   unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year
-  unfccc_ghg_data.unfccc_crf_reader.read_new_unfccc_crf_for_year_datalad
   unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission
-  unfccc_ghg_data.unfccc_crf_reader.read_unfccc_crf_submission_datalad
   unfccc_ghg_data.unfccc_crf_reader.test_read_unfccc_crf_for_year
   unfccc_ghg_data.unfccc_crf_reader.unfccc_crf_reader_core
   unfccc_ghg_data.unfccc_crf_reader.unfccc_crf_reader_devel

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_di\_reader.process\_unfccc\_di\_for\_country\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_datalad

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_di\_reader.process\_unfccc\_di\_for\_country\_group\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group_datalad

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_di\_reader.read\_unfccc\_di\_for\_country\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_datalad

+ 0 - 6
docs/source/api/unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group_datalad.rst

@@ -1,6 +0,0 @@
-unfccc\_ghg\_data.unfccc\_di\_reader.read\_unfccc\_di\_for\_country\_group\_datalad
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. automodule:: unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group_datalad
-
-.. currentmodule:: unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group_datalad

+ 0 - 4
docs/source/api/unfccc_ghg_data.unfccc_di_reader.rst

@@ -10,13 +10,9 @@ unfccc\_ghg\_data.unfccc\_di\_reader
   :toctree: ./
 
   unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country
-  unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_datalad
   unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group
-  unfccc_ghg_data.unfccc_di_reader.process_unfccc_di_for_country_group_datalad
   unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country
-  unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_datalad
   unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group
-  unfccc_ghg_data.unfccc_di_reader.read_unfccc_di_for_country_group_datalad
   unfccc_ghg_data.unfccc_di_reader.unfccc_di_reader_config
   unfccc_ghg_data.unfccc_di_reader.unfccc_di_reader_core
   unfccc_ghg_data.unfccc_di_reader.unfccc_di_reader_datalad

+ 6 - 0
docs/source/api/unfccc_ghg_data.unfccc_di_reader.unfccc_di_reader_core.rst

@@ -31,6 +31,12 @@ convert\_DI\_data\_to\_pm2\_if
 .. autofunction:: convert_DI_data_to_pm2_if
 
 
+convert\_DI\_IF\_data\_to\_pm2
+==============================
+
+.. autofunction:: convert_DI_IF_data_to_pm2
+
+
 read\_UNFCCC\_DI\_for\_country\_group
 =====================================
 

+ 211 - 192
dodo.py

@@ -1,5 +1,11 @@
 """
 Define the tasks for UNFCCC data repository
+
+The setup with the function that calls datalad.api.run is necessary because doit doesn't
+like the return values of datalad.api.run
+
+TODO: could add try-except blocks and return proper values so doit knows if the task
+ was run successfully
 """
 import os
 import sys
@@ -10,8 +16,22 @@ from doit import get_var
 root_path = "."
 os.environ["UNFCCC_GHG_ROOT_PATH"] = root_path
 
+from unfccc_ghg_data.helper.functions import (  # noqa: E402
+    get_country_datasets,
+    get_country_submissions,
+)
+from unfccc_ghg_data.unfccc_crf_reader.unfccc_crf_reader_devel import (  # noqa: E402
+    read_year_to_test_specs,
+)
 from unfccc_ghg_data.unfccc_crf_reader.unfccc_crf_reader_prod import (  # noqa: E402
     read_crf_for_country_datalad,
+    read_new_crf_for_year_datalad,
+)
+from unfccc_ghg_data.unfccc_di_reader import (  # noqa: E402
+    process_DI_for_country_datalad,
+    process_DI_for_country_group_datalad,
+    read_DI_for_country_datalad,
+    read_DI_for_country_group_datalad,
 )
 
 
@@ -58,16 +78,6 @@ def task_in_venv():
     }
 
 
-# set UNFCCC_GHG_ROOT_PATH environment variable
-def task_set_env():
-    """
-    Set the environment variable for the module so data is stored in the correct folders
-    """
-    return {
-        "actions": [set_root_path],
-    }
-
-
 # Task to create the mapping files which map folder names to ISO 3-letter country codes
 read_config_folder = {
     "folder": get_var("folder", None),
@@ -400,6 +410,7 @@ read_config_crf = {
     "countries": get_var("countries", None),
     "data_year": get_var("data_year", None),
     "totest": get_var("totest", None),
+    "type": get_var("type", "CRF"),
 }
 
 
@@ -416,6 +427,7 @@ def task_read_unfccc_crf_submission():
             submission_year=int(read_config_crf["submission_year"]),
             submission_date=read_config_crf["submission_date"],
             re_read=re_read,
+            type=read_config_crf["type"],
         )
 
     return {
@@ -423,190 +435,197 @@ def task_read_unfccc_crf_submission():
             (read_CRF,),
             (map_folders, ["extracted_data/UNFCCC"]),
         ],
-        "task_dep": ["set_env"],
         "verbosity": 2,
         "setup": ["in_venv"],
     }
 
 
-#
-# def task_read_new_unfccc_crf_for_year():
-#     """
-#     Read CRF submission for all countries for given submission year.
-#
-#     By default only reads data not present yet. Only reads the latest updated
-#     submission for each country.
-#     """
-#     actions = [
-#         f"python src/unfccc_ghg_data/unfccc_crf_reader"
-#         f"/read_new_unfccc_crf_for_year_datalad.py "
-#         f"--submission_year={read_config_crf['submission_year']} ",
-#         "python src/unfccc_ghg_data/helper/folder_mapping.py "
-#         "--folder=extracted_data/UNFCCC",
-#     ]
-#     # specifying countries is currently disabled duo to problems with command line
-#     # list arguments
-#     # if read_config_crf["countries"] is not None:
-#     #        actions[0] = actions[0] + f"--countries={read_config_crf['countries']} "
-#     if read_config_crf["re_read"] == "True":
-#         actions[0] = actions[0] + " --re_read"
-#     return {
-#         #'basename': "Read_CRF_year",
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# def task_test_read_unfccc_crf_for_year():
-#     """
-#     Test CRF reading.
-#
-#     Test CRF with a single year only for speed and logging to extend specifications
-#     if necessary.
-#     """
-#     actions = [
-#         f"python "
-#         f"src/unfccc_ghg_data/unfccc_crf_reader"
-#         f"/test_read_unfccc_crf_for_year.py "
-#         f"--submission_year={read_config_crf['submission_year']} "
-#         f"--country={read_config_crf['country']} "
-#     ]
-#     if read_config_crf["totest"] == "True":
-#         actions[0] = actions[0] + " --totest"
-#
-#     if read_config_crf["data_year"] is not None:
-#         actions[0] = actions[0] + f"--data_year={read_config_crf['data_year']} "
-#     return {
-#         #'basename': "Read_CRF_year",
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# def task_compile_raw_unfccc_crf_for_year():
-#     """
-#     Collect all latest CRF submissions for a given year
-#
-#     Reads the latest data fromt he extracted data folder for each country.
-#     Notifies the user if new data are available in the downloaded_data folder
-#     which have not yet been read.
-#
-#     Data are saved in the datasets/UNFCCC/CRFYYYY folder.
-#     """
-#     actions = [
-#         f"python "
-#         f"src/unfccc_ghg_data/unfccc_crf_reader/crf_raw_for_year.py "
-#         f"--submission_year={read_config_crf['submission_year']} "
-#     ]
-#     return {
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# # tasks for DI reader
-# # datalad run is called from within the read_unfccc_di_for_country.py script
-# read_config_di = {
-#     "country": get_var("country", None),
-#     "date": get_var("date", None),
-#     "annexI": get_var("annexI", False),
-#     # "countries": get_var('countries', None),
-# }
-#
-#
-# def task_read_unfccc_di_for_country():
-#     """Read DI data for a country"""
-#     actions = [
-#         f"python "
-#         f"src/unfccc_ghg_data/unfccc_di_reader/read_unfccc_di_for_country_datalad.py "
-#         f"--country={read_config_di['country']}",
-#         "python src/unfccc_ghg_data/helper/folder_mapping.py "
-#         "--folder=extracted_data/UNFCCC",
-#     ]
-#     return {
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# def task_process_unfccc_di_for_country():
-#     """Process DI data for a country"""
-#     actions = [
-#         f"python "
-#         f"src/unfccc_ghg_data/unfccc_di_reader/process_unfccc_di_for_country_datalad"
-#         f".py "
-#         f"--country={read_config_di['country']} --date={read_config_di['date']}",
-#         "python src/unfccc_ghg_data/helper/folder_mapping.py "
-#         "--folder=extracted_data/UNFCCC",
-#     ]
-#     return {
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# def task_read_unfccc_di_for_country_group():
-#     """Read DI data for a country group"""
-#     actions = [
-#         "python "
-#         "src/unfccc_ghg_data/unfccc_di_reader/read_unfccc_di_for_country_group_datalad"
-#         ".py",
-#         "python src/unfccc_ghg_data/helper/folder_mapping.py "
-#         "--folder=extracted_data/UNFCCC",
-#     ]
-#     if read_config_di["annexI"] == "True":
-#         actions[0] = actions[0] + " --annexI"
-#
-#     return {
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# def task_process_unfccc_di_for_country_group():
-#     """Process DI data for a country group"""
-#     actions = [
-#         "python "
-#         "src/unfccc_ghg_data/unfccc_di_reader"
-#         "/process_unfccc_di_for_country_group_datalad"
-#         ".py",
-#     ]
-#     if read_config_di["annexI"] == "True":
-#         actions[0] = actions[0] + " --annexI"
-#     if read_config_di["date"] is not None:
-#         actions[0] = actions[0] + f" --date={read_config_di['date']}"
-#
-#     return {
-#         "actions": actions,
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
-#
-#
-# # general tasks
-# def task_country_info():
-#     """
-#     Print information on submissions and datasets available for given country
-#     """
-#     return {
-#         "actions": [
-#             f"python src/unfccc_ghg_data/helper/country_info.py "
-#             f"--country={read_config['country']}"
-#         ],
-#         "task_dep": ["set_env"],
-#         "verbosity": 2,
-#         "setup": ["in_venv"],
-#     }
+def task_read_new_unfccc_crf_for_year():
+    """
+    Read CRF/CRT submission for all countries for given submission year.
+
+    By default only reads data not present yet. Only reads the latest updated
+    submission for each country.
+    """
+
+    def read_new_CRF():
+        if read_config_crf["re_read"] == "True":
+            re_read = True
+        else:
+            re_read = False
+        read_new_crf_for_year_datalad(
+            submission_year=int(read_config_crf["submission_year"]),
+            # countries=read_config_crf["countries"],
+            re_read=re_read,
+            type=read_config_crf["type"],
+        )
+
+    return {
+        "actions": [
+            (read_new_CRF,),
+            (map_folders, ["extracted_data/UNFCCC"]),
+        ],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+def task_test_read_unfccc_crf_for_year():
+    """
+    Test CRF/CRT reading.
+
+    Test CRF/CRT with a single year only for speed and logging to extend specifications
+    if necessary.
+    """
+
+    def read_CRF():
+        if read_config_crf["totest"] == "True":
+            totest = True
+        else:
+            totest = False
+        if read_config_crf["data_year"] is not None:
+            data_year = int(read_config_crf["data_year"])
+        else:
+            data_year = None
+        read_year_to_test_specs(
+            submission_year=int(read_config_crf["submission_year"]),
+            data_year=data_year,
+            totest=totest,
+            country_code=read_config_crf["country"],
+            type=read_config_crf["type"],
+        )
+
+    return {
+        "actions": [
+            (read_CRF,),
+            (map_folders, ["extracted_data/UNFCCC"]),
+        ],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+def task_compile_raw_unfccc_crf_for_year():
+    """
+    Collect all latest CRF/CRT submissions for a given year / submission round
+
+    Reads the latest data from the extracted data folder for each country.
+    Notifies the user if new data are available in the downloaded_data folder
+    which have not yet been read.
+
+    Data are saved in the datasets/UNFCCC/[CRFYYYY|CRTX] folder.
+    TODO: could make a function from the script
+    """
+    actions = [
+        f"python "
+        f"src/unfccc_ghg_data/unfccc_crf_reader/crf_raw_for_year.py "
+        f"--submission_year={read_config_crf['submission_year']} "
+        f"--type={read_config_crf['type']} "
+    ]
+    return {
+        "actions": actions,
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+# tasks for DI reader
+# TODO DI tasks need testing
+# datalad run is called from within the read_unfccc_di_for_country.py script
+read_config_di = {
+    "country": get_var("country", None),
+    "date": get_var("date", None),
+    "annexI": get_var("annexI", False),
+    # "countries": get_var('countries', None),
+}
+
+
+def task_read_unfccc_di_for_country():
+    """Read DI data for a country"""
+    return {
+        "actions": [
+            (read_DI_for_country_datalad, [read_config_di["country"]]),
+            (map_folders, ["extracted_data/UNFCCC"]),
+        ],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+def task_process_unfccc_di_for_country():
+    """Process DI data for a country"""
+    return {
+        "actions": [
+            (
+                process_DI_for_country_datalad,
+                [],
+                {
+                    "country": read_config_di["country"],
+                    "date_str": read_config_di["date"],
+                },
+            ),
+            (map_folders, ["extracted_data/UNFCCC"]),
+        ],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+def task_read_unfccc_di_for_country_group():
+    """Read DI data for a country group"""
+
+    def read_DI():
+        if read_config_di["annexI"] == "True":
+            annexI = True
+        else:
+            annexI = False
+        read_DI_for_country_group_datalad(annexI=annexI)
+
+    return {
+        "actions": [(read_DI,), (map_folders, ["extracted_data/UNFCCC"])],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+def task_process_unfccc_di_for_country_group():
+    """Process DI data for a country group"""
+
+    def proc_DI():
+        if read_config_di["annexI"] == "True":
+            annexI = True
+        else:
+            annexI = False
+        process_DI_for_country_group_datalad(
+            annexI=annexI,
+            date_str=read_config_di["date"],
+        )
+
+    return {
+        "actions": [(proc_DI,), (map_folders, ["extracted_data/UNFCCC"])],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }
+
+
+# general tasks
+def task_country_info():
+    """
+    Print information on submissions and datasets available for given country
+    """
+
+    def country_info(country):
+        # print available submissions
+        print("=" * 15 + " Available submissions " + "=" * 15)
+        get_country_submissions(country, True)
+        print("")
+
+        # print available datasets
+        print("=" * 15 + " Available datasets " + "=" * 15)
+        get_country_datasets(country, True)
+
+    return {
+        "actions": [(country_info, [read_config["country"]])],
+        "verbosity": 2,
+        "setup": ["in_venv"],
+    }

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_BTR1-2024-06-24.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/wm/95/MD5E-s1--68b329da9893e34099c7d8ad5cb9c940.csv/MD5E-s1--68b329da9893e34099c7d8ad5cb9c940.csv

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_BUR-2024-05-27.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/fM/QF/MD5E-s434--4e092d9f2f3567558f1f8b5dd8b36974.csv/MD5E-s434--4e092d9f2f3567558f1f8b5dd8b36974.csv

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_BUR-2024-06-24.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/Jj/1X/MD5E-s289--e5c2fbde94abdab0344f7ccc96e80889.csv/MD5E-s289--e5c2fbde94abdab0344f7ccc96e80889.csv

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_CRF2023-2024-05-22.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/wm/95/MD5E-s1--68b329da9893e34099c7d8ad5cb9c940.csv/MD5E-s1--68b329da9893e34099c7d8ad5cb9c940.csv

+ 1 - 0
downloaded_data/UNFCCC/00_new_downloads_NC-2024-06-24.csv

@@ -0,0 +1 @@
+../../.git/annex/objects/vW/Kj/MD5E-s163--a7c8c66e934e3a7d8cd6547ace14c830.csv/MD5E-s163--a7c8c66e934e3a7d8cd6547ace14c830.csv

+ 1 - 0
downloaded_data/UNFCCC/Cabo_Verde/BUR1/BUR_EN_Digital.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/7f/vz/MD5E-s6592715--5d98774dbf1a4e7c311c82f22b416a34.pdf/MD5E-s6592715--5d98774dbf1a4e7c311c82f22b416a34.pdf

+ 1 - 0
downloaded_data/UNFCCC/China/BUR3/China_BUR3_Chinese.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/58/9z/MD5E-s943178--6c3c7cf95c2b8d2596c43117b6f5666a.pdf/MD5E-s943178--6c3c7cf95c2b8d2596c43117b6f5666a.pdf

+ 1 - 0
downloaded_data/UNFCCC/China/BUR3/China_BUR3_English.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/28/XP/MD5E-s969227--646f2b07b58c484b937a4afe6745913b.pdf/MD5E-s969227--646f2b07b58c484b937a4afe6745913b.pdf

+ 1 - 0
downloaded_data/UNFCCC/Ethiopia/BUR1/Ethiopia_First_BUR.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/Qx/50/MD5E-s4112679--ee9cd4dea40c6a9eb9eb0064c58941c0.pdf/MD5E-s4112679--ee9cd4dea40c6a9eb9eb0064c58941c0.pdf

+ 1 - 0
downloaded_data/UNFCCC/Ethiopia/NC3/Ethiopia_Revised_third_NC.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/2k/Z1/MD5E-s10214702--64fff3c4ae71e720c69fbccf8fec230d.pdf/MD5E-s10214702--64fff3c4ae71e720c69fbccf8fec230d.pdf

+ 1 - 0
downloaded_data/UNFCCC/Fiji/BUR1/Fiji_GHG_NIR_2023_Final.pdf

@@ -0,0 +1 @@
+../../../../.git/annex/objects/fP/zK/MD5E-s6506574--b053162c016b58f13629cba244556c11.pdf/MD5E-s6506574--b053162c016b58f13629cba244556c11.pdf

+ 1 - 0
downloaded_data/UNFCCC/United_Arab_Emirates/BUR1/all_data_manual.csv

@@ -0,0 +1 @@
+../../../../.git/annex/objects/3F/Zw/MD5E-s1726--a09d9e4d2d62e49c1687f1667a341118.csv/MD5E-s1726--a09d9e4d2d62e49c1687f1667a341118.csv

+ 1 - 0
downloaded_data/UNFCCC/United_Arab_Emirates/BUR1/tables_manual.ods

@@ -0,0 +1 @@
+../../../../.git/annex/objects/PX/fj/MD5E-s57283--e9b971b7d617721b136e6873569205a2.ods/MD5E-s57283--e9b971b7d617721b136e6873569205a2.ods

+ 1 - 1
downloaded_data/UNFCCC/submissions-annexI_2023.csv

@@ -1 +1 @@
-../../.git/annex/objects/2X/Xm/MD5E-s24273--fba3f5eca40640c65dbeb96a2d7d3eb5.csv/MD5E-s24273--fba3f5eca40640c65dbeb96a2d7d3eb5.csv
+../../.git/annex/objects/ww/3V/MD5E-s24293--25d23f83fe67ce10def1a03865c4005d.csv/MD5E-s24293--25d23f83fe67ce10def1a03865c4005d.csv

+ 1 - 1
downloaded_data/UNFCCC/submissions-bur.csv

@@ -1 +1 @@
-../../.git/annex/objects/qj/XZ/MD5E-s54279--b2771d5ad902ce77fd39778f6eb2a6f0.csv/MD5E-s54279--b2771d5ad902ce77fd39778f6eb2a6f0.csv
+../../.git/annex/objects/x0/02/MD5E-s54956--276f903ed8f255492978c6dfe91669ab.csv/MD5E-s54956--276f903ed8f255492978c6dfe91669ab.csv

+ 1 - 1
downloaded_data/UNFCCC/submissions-nc.csv

@@ -1 +1 @@
-../../.git/annex/objects/7v/V9/MD5E-s84722--00b0ee8727956dafa359bbe5b4ae844c.csv/MD5E-s84722--00b0ee8727956dafa359bbe5b4ae844c.csv
+../../.git/annex/objects/p5/qp/MD5E-s84719--c96eb5f9833f3ae071eb551a15440b9e.csv/MD5E-s84719--c96eb5f9833f3ae071eb551a15440b9e.csv

+ 1 - 0
extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+AFG_DI_8ca0002f77a67e47c93eb8a43637a140_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+AFG_DI_8ca0002f77a67e47c93eb8a43637a140_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Afghanistan/AFG_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+AFG_DI_8ca0002f77a67e47c93eb8a43637a140_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Albania/ALB_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/Gz/QW/MD5E-s229278--6a3268a71605396f4669807030ca565a.csv/MD5E-s229278--6a3268a71605396f4669807030ca565a.csv

+ 1 - 0
extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/V7/57/MD5E-s330230--a3ce1bbd290f4225dc6e65594f00d2ce.nc/MD5E-s330230--a3ce1bbd290f4225dc6e65594f00d2ce.nc

+ 33 - 0
extracted_data/UNFCCC/Albania/ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.yaml

@@ -0,0 +1,33 @@
+attrs:
+  references: https://di.unfccc.int
+  title: Data submitted to the UNFCCC by country Albania as available in the DI interface
+    on 2023-05-24. Processed on 2024-06-24
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2024-06-24
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Access_Date)
+  sec_cats:
+  - class
+  - measure
+  entity: UnspMixOfPFCs
+  gwp_context: AR6GWP100
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - source
+  - measure
+  - class
+  - scenario (Access_Date)
+  - area (ISO3)
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: ALB_DI_e731efab3ff98f249034e75575ca9b4d_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+DZA_DI_2809d4444fbd7e0ba92f242cd84ee876_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+DZA_DI_2809d4444fbd7e0ba92f242cd84ee876_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Algeria/DZA_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+DZA_DI_2809d4444fbd7e0ba92f242cd84ee876_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+AGO_DI_531fa8f6e0962434d36c1529d08cec54_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+AGO_DI_531fa8f6e0962434d36c1529d08cec54_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Angola/AGO_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+AGO_DI_531fa8f6e0962434d36c1529d08cec54_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+ATG_DI_4b06ef85f3c725b17ba511af6d5b5992_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+ATG_DI_4b06ef85f3c725b17ba511af6d5b5992_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Antigua_and_Barbuda/ATG_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+ATG_DI_4b06ef85f3c725b17ba511af6d5b5992_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+ARG_DI_6a0c8594167243d451ce6f45bdbcd474_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+ARG_DI_6a0c8594167243d451ce6f45bdbcd474_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Argentina/ARG_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+ARG_DI_6a0c8594167243d451ce6f45bdbcd474_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+ARM_DI_ec360efac937659c59b6fb518118931f_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+ARM_DI_ec360efac937659c59b6fb518118931f_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Armenia/ARM_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+ARM_DI_ec360efac937659c59b6fb518118931f_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/6g/qp/MD5E-s1237117--9b409343319c889adfa1eebbf976c80f.csv/MD5E-s1237117--9b409343319c889adfa1eebbf976c80f.csv

+ 1 - 0
extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/zw/f1/MD5E-s1733750--36e2ec46100726445fc8a904b3021a6f.nc/MD5E-s1733750--36e2ec46100726445fc8a904b3021a6f.nc

+ 26 - 0
extracted_data/UNFCCC/Australia/AUS_CRT1_12042024.yaml

@@ -0,0 +1,26 @@
+attrs:
+  references: https://unfccc.int/ghg-inventories-annex-i-parties/1
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  title: 'Data submitted in 1 to the UNFCCC in the common reporting tables (CRT) by
+    Australia. Submission date: 12042024'
+  comment: Read fom xlsx file by Johannes Gütschow
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (CRF2013_1)
+  area: area (ISO3)
+  scen: scenario (PRIMAP)
+  sec_cats:
+  - class
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - category (CRF2013_1)
+  - provenance
+  - area (ISO3)
+  - scenario (PRIMAP)
+  - class
+  - source
+  - entity
+  - unit
+data_file: AUS_CRT1_12042024.csv

+ 1 - 0
extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+AZE_DI_fee6dd0d7127b42a6592c73e04020107_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+AZE_DI_fee6dd0d7127b42a6592c73e04020107_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Azerbaijan/AZE_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+AZE_DI_fee6dd0d7127b42a6592c73e04020107_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BHS_DI_a0032be7a66257667f0d52884afe992a_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BHS_DI_a0032be7a66257667f0d52884afe992a_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BHS_DI_a0032be7a66257667f0d52884afe992a_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.csv

@@ -0,0 +1 @@
+../../../.git/annex/objects/MQ/vQ/MD5E-s27246--e75accd24557cf12e0f8e675d8cd00e2.csv/MD5E-s27246--e75accd24557cf12e0f8e675d8cd00e2.csv

+ 1 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.nc

@@ -0,0 +1 @@
+../../../.git/annex/objects/5z/g4/MD5E-s92914--5b2fa1383d6cbe42b0d4cbdd80c98ada.nc/MD5E-s92914--5b2fa1383d6cbe42b0d4cbdd80c98ada.nc

+ 33 - 0
extracted_data/UNFCCC/Bahamas/BHS_DI_a0032be7a66257667f0d52884afe992a_hash.yaml

@@ -0,0 +1,33 @@
+attrs:
+  references: https://di.unfccc.int
+  title: Data submitted to the UNFCCC by country Bahamas as available in the DI interface
+    on 2023-05-24. Processed on 2024-06-24
+  comment: Data read from the UNFCCC DI flexible query interface using the API. Data
+    read on 2023-05-24. Processed on 2024-06-24
+  rights: ''
+  contact: mail@johannes-guetschow.de
+  institution: United Nations Framework Convention on Climate Change (www.unfccc.int)
+  cat: category (IPCC2006_PRIMAP)
+  area: area (ISO3)
+  scen: scenario (Access_Date)
+  sec_cats:
+  - class
+  - measure
+  gwp_context: SARGWP100
+  entity: NOx
+time_format: '%Y'
+dimensions:
+  '*':
+  - time
+  - area (ISO3)
+  - measure
+  - scenario (Access_Date)
+  - source
+  - provenance
+  - category (IPCC2006_PRIMAP)
+  - class
+  - entity
+  - unit
+additional_coordinates:
+  orig_cat_name: category (IPCC2006_PRIMAP)
+data_file: BHS_DI_a0032be7a66257667f0d52884afe992a_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BHR_DI_8658422e3d5088ee64a6efde31221777_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BHR_DI_8658422e3d5088ee64a6efde31221777_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Bahrain/BHR_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BHR_DI_8658422e3d5088ee64a6efde31221777_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BGD_DI_6cf9203a810c50d075ee4046d222004c_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BGD_DI_6cf9203a810c50d075ee4046d222004c_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Bangladesh/BGD_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BGD_DI_6cf9203a810c50d075ee4046d222004c_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BRB_DI_bebda6c477d48b78a1dd0d6b6dfa7860_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BRB_DI_bebda6c477d48b78a1dd0d6b6dfa7860_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Barbados/BRB_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BRB_DI_bebda6c477d48b78a1dd0d6b6dfa7860_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BLZ_DI_93ec94f6b0dcdbb3af12e64dcea29074_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BLZ_DI_93ec94f6b0dcdbb3af12e64dcea29074_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Belize/BLZ_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BLZ_DI_93ec94f6b0dcdbb3af12e64dcea29074_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BEN_DI_099294681ffbc7d641cb32ce55968aeb_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BEN_DI_099294681ffbc7d641cb32ce55968aeb_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Benin/BEN_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BEN_DI_099294681ffbc7d641cb32ce55968aeb_hash.yaml

+ 1 - 0
extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.csv

@@ -0,0 +1 @@
+BTN_DI_d98b6e28072bfd0160ba7772ca4fe1e5_hash.csv

+ 1 - 0
extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.nc

@@ -0,0 +1 @@
+BTN_DI_d98b6e28072bfd0160ba7772ca4fe1e5_hash.nc

+ 1 - 0
extracted_data/UNFCCC/Bhutan/BTN_DI_2023-05-24_2024-06-24.yaml

@@ -0,0 +1 @@
+BTN_DI_d98b6e28072bfd0160ba7772ca4fe1e5_hash.yaml

Некоторые файлы не были показаны из-за большого количества измененных файлов