Vizzuality · BielStela · Jul 20, 2023 · Jul 20, 2023
diff --git a/data/.dockerignore b/data/.dockerignore
diff --git a/data/.pre-commit-config.yaml b/data/.pre-commit-config.yaml
@@ -1,6 +1,36 @@
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v2.3.0
+    hooks:
+      - id: check-yaml
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.0.275
+    hooks:
+      - id: ruff
+        args: [ "--line-length=100", "--select=E,F,N"]
+
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
-        args: ["--line-length=120"]
+        args: [ "--line-length=100" ]
+
+  - repo: https://github.com/nbQA-dev/nbQA
+    rev: 1.7.0
+    hooks:
+      - id: nbqa-black
+        args: [ "--line-length=100"]
+      - id: nbqa-isort
+        args: [ "--float-to-top", "--profile=black"]
+      - id: nbqa-ruff
+        args: [ "--line-length=100" , "--select=E,F,N", "--fix"]
+
+  # check for private keys and passwords!
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.17.0
+    hooks:
+      - id: gitleaks-docker
+
diff --git a/data/Dockerfile → data/importers/Dockerfile b/data/Dockerfile → data/importers/Dockerfile
@@ -21,7 +21,7 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2
 
 RUN pip install -q --upgrade --no-cache-dir pip
 
-COPY ./requirements.txt requirements.txt
+COPY requirements.txt requirements.txt
 RUN pip install -q --no-cache-dir -r requirements.txt
 
 WORKDIR /
@@ -30,7 +30,7 @@ RUN mkdir -p data/
 COPY ./base_data_importer/ /base_data_importer
 COPY ./data_download/ /data_download
 COPY h3_data_importer /h3_data_importer
-COPY indicator_coefficient_importer/ /indicator_coefficient_importer
-COPY ./Makefile ./Makefile
+COPY indicator_coefficient_importer /indicator_coefficient_importer
+COPY Makefile ./Makefile
 
 ENTRYPOINT ["/usr/bin/make"]
diff --git a/data/Makefile → data/importers/Makefile b/data/Makefile → data/importers/Makefile
diff --git a/data/h3_data_importer/__init__.py → data/importers/__init__.py b/data/h3_data_importer/__init__.py → data/importers/__init__.py
diff --git a/data/base_data_importer/Makefile → data/importers/base_data_importer/Makefile b/data/base_data_importer/Makefile → data/importers/base_data_importer/Makefile
diff --git a/data/base_data_importer/README.md → data/importers/base_data_importer/README.md b/data/base_data_importer/README.md → data/importers/base_data_importer/README.md
diff --git a/data/base_data_importer/csv_to_table.py → ...orters/base_data_importer/csv_to_table.py b/data/base_data_importer/csv_to_table.py → ...orters/base_data_importer/csv_to_table.py
diff --git a/data/base_data_importer/data/1.units.csv → ...rters/base_data_importer/data/1.units.csv b/data/base_data_importer/data/1.units.csv → ...rters/base_data_importer/data/1.units.csv
diff --git a/data/base_data_importer/data/2.indicator.csv → ...s/base_data_importer/data/2.indicator.csv b/data/base_data_importer/data/2.indicator.csv → ...s/base_data_importer/data/2.indicator.csv
diff --git a/..._data_importer/data/3.unit_conversion.csv → ..._data_importer/data/3.unit_conversion.csv b/..._data_importer/data/3.unit_conversion.csv → ..._data_importer/data/3.unit_conversion.csv
diff --git a/data/base_data_importer/data/4.material.csv → ...rs/base_data_importer/data/4.material.csv b/data/base_data_importer/data/4.material.csv → ...rs/base_data_importer/data/4.material.csv
diff --git a/data/data.sh → data/importers/data.sh b/data/data.sh → data/importers/data.sh
diff --git a/data/data_download/Makefile → data/importers/data_download/Makefile b/data/data_download/Makefile → data/importers/data_download/Makefile
diff --git a/data/data_download/countriesregions.csv → ...orters/data_download/countriesregions.csv b/data/data_download/countriesregions.csv → ...orters/data_download/countriesregions.csv
diff --git a/.../data_download/populate_admin_regions.sql → .../data_download/populate_admin_regions.sql b/.../data_download/populate_admin_regions.sql → .../data_download/populate_admin_regions.sql
diff --git a/data/docker-compose.yml → data/importers/docker-compose.yml b/data/docker-compose.yml → data/importers/docker-compose.yml
@@ -2,9 +2,9 @@ version: "3.8"
 services:
   landgriffon-seed-data:
     build:
-        context: ./
+        context: ..
         dockerfile: Dockerfile
     command: seed-data
     env_file:
-        - '../.env'
+        - '../../.env'
     network_mode: "host"
diff --git a/...NEP_SETAC/Ch3 CFs_Climate change v01.xlsx → ...NEP_SETAC/Ch3 CFs_Climate change v01.xlsx b/...NEP_SETAC/Ch3 CFs_Climate change v01.xlsx → ...NEP_SETAC/Ch3 CFs_Climate change v01.xlsx
diff --git a/...ractions+CharacterizationFactors v01.xlsx → ...ractions+CharacterizationFactors v01.xlsx b/...ractions+CharacterizationFactors v01.xlsx → ...ractions+CharacterizationFactors v01.xlsx
diff --git a/..._UNEP_SETAC/Ch5.1_AWARE - Watersheds.xlsx → ..._UNEP_SETAC/Ch5.1_AWARE - Watersheds.xlsx b/..._UNEP_SETAC/Ch5.1_AWARE - Watersheds.xlsx → ..._UNEP_SETAC/Ch5.1_AWARE - Watersheds.xlsx
diff --git a/...WARE_country_regions_world_april2016.xlsx → ...WARE_country_regions_world_april2016.xlsx b/...WARE_country_regions_world_april2016.xlsx → ...WARE_country_regions_world_april2016.xlsx
diff --git a/...ter-HumanHealthCFlist_2016-12-12 v01.xlsx → ...ter-HumanHealthCFlist_2016-12-12 v01.xlsx b/...ter-HumanHealthCFlist_2016-12-12 v01.xlsx → ...ter-HumanHealthCFlist_2016-12-12 v01.xlsx
diff --git a/...er/LCIA_UNEP_SETAC/Ch6 PSLglobal v01.xlsx → ...er/LCIA_UNEP_SETAC/Ch6 PSLglobal v01.xlsx b/...er/LCIA_UNEP_SETAC/Ch6 PSLglobal v01.xlsx → ...er/LCIA_UNEP_SETAC/Ch6 PSLglobal v01.xlsx
diff --git a/...SETAC/Ch6_PSL_regional_ecoregions_v01.csv → ...SETAC/Ch6_PSL_regional_ecoregions_v01.csv b/...SETAC/Ch6_PSL_regional_ecoregions_v01.csv → ...SETAC/Ch6_PSL_regional_ecoregions_v01.csv
diff --git a/.../LCIA_UNEP_SETAC/Ch6_PSLregional_v01.xlsx → .../LCIA_UNEP_SETAC/Ch6_PSLregional_v01.xlsx b/.../LCIA_UNEP_SETAC/Ch6_PSLregional_v01.xlsx → .../LCIA_UNEP_SETAC/Ch6_PSLregional_v01.xlsx
diff --git a/data/h3_data_importer/Makefile → data/importers/h3_data_importer/Makefile b/data/h3_data_importer/Makefile → data/importers/h3_data_importer/Makefile
diff --git a/data/h3_data_importer/README.md → data/importers/h3_data_importer/README.md b/data/h3_data_importer/README.md → data/importers/h3_data_importer/README.md
diff --git a/...ndicator_coefficient_importer/__init__.py → data/importers/h3_data_importer/__init__.py b/...ndicator_coefficient_importer/__init__.py → data/importers/h3_data_importer/__init__.py
diff --git a/...mporter/cog_to_contextual_layer_linker.py → ...mporter/cog_to_contextual_layer_linker.py b/...mporter/cog_to_contextual_layer_linker.py → ...mporter/cog_to_contextual_layer_linker.py
diff --git a/...tif_mapping_v1_20210809 - commodities.csv → ...tif_mapping_v1_20210809 - commodities.csv b/...tif_mapping_v1_20210809 - commodities.csv → ...tif_mapping_v1_20210809 - commodities.csv
diff --git a/...etadata/bluewater_footprint_metadata.json → ...etadata/bluewater_footprint_metadata.json b/...etadata/bluewater_footprint_metadata.json → ...etadata/bluewater_footprint_metadata.json
diff --git a/..._metadata/contextual_metadata_schema.json → ..._metadata/contextual_metadata_schema.json b/..._metadata/contextual_metadata_schema.json → ..._metadata/contextual_metadata_schema.json
diff --git a/...ata/h3_grid_aqueduct_global_metadata.json → ...ata/h3_grid_aqueduct_global_metadata.json b/...ata/h3_grid_aqueduct_global_metadata.json → ...ata/h3_grid_aqueduct_global_metadata.json
diff --git a/...metadata/h3_grid_bio_global_metadata.json → ...metadata/h3_grid_bio_global_metadata.json b/...metadata/h3_grid_bio_global_metadata.json → ...metadata/h3_grid_bio_global_metadata.json
diff --git a/...adata/h3_grid_carbon_global_metadata.json → ...adata/h3_grid_carbon_global_metadata.json b/...adata/h3_grid_carbon_global_metadata.json → ...adata/h3_grid_carbon_global_metadata.json
diff --git a/...3_grid_deforestation_global_metadata.json → ...3_grid_deforestation_global_metadata.json b/...3_grid_deforestation_global_metadata.json → ...3_grid_deforestation_global_metadata.json
diff --git a/...metadata/h3_grid_hdi_global_metadata.json → ...metadata/h3_grid_hdi_global_metadata.json b/...metadata/h3_grid_hdi_global_metadata.json → ...metadata/h3_grid_hdi_global_metadata.json
diff --git a/data/h3_data_importer/csv_to_h3_table.py → ...rters/h3_data_importer/csv_to_h3_table.py b/data/h3_data_importer/csv_to_h3_table.py → ...rters/h3_data_importer/csv_to_h3_table.py
diff --git a/...ata_importer/data_checksums/deforestation → ...ata_importer/data_checksums/deforestation b/...ata_importer/data_checksums/deforestation → ...ata_importer/data_checksums/deforestation
diff --git a/...h3_data_importer/data_checksums/forestGHG → ...h3_data_importer/data_checksums/forestGHG b/...h3_data_importer/data_checksums/forestGHG → ...h3_data_importer/data_checksums/forestGHG
diff --git a/...3_data_importer/data_checksums/mapspam_ha → ...3_data_importer/data_checksums/mapspam_ha b/...3_data_importer/data_checksums/mapspam_ha → ...3_data_importer/data_checksums/mapspam_ha
diff --git a/...data_importer/data_checksums/mapspam_prod → ...data_importer/data_checksums/mapspam_prod b/...data_importer/data_checksums/mapspam_prod → ...data_importer/data_checksums/mapspam_prod
diff --git a/...ata_importer/raster_folder_to_h3_table.py → ...ata_importer/raster_folder_to_h3_table.py b/...ata_importer/raster_folder_to_h3_table.py → ...ata_importer/raster_folder_to_h3_table.py
diff --git a/data/h3_data_importer/utils.py → data/importers/h3_data_importer/utils.py b/data/h3_data_importer/utils.py → data/importers/h3_data_importer/utils.py
diff --git a/...ata_importer/vector_folder_to_h3_table.py → ...ata_importer/vector_folder_to_h3_table.py b/...ata_importer/vector_folder_to_h3_table.py → ...ata_importer/vector_folder_to_h3_table.py
diff --git a/data/indicator_coefficient_importer/Makefile → ...s/indicator_coefficient_importer/Makefile b/data/indicator_coefficient_importer/Makefile → ...s/indicator_coefficient_importer/Makefile
diff --git a/data/notebooks/Final/.gitkeep → ...ndicator_coefficient_importer/__init__.py b/data/notebooks/Final/.gitkeep → ...ndicator_coefficient_importer/__init__.py
diff --git a/...rter/data/bwfp_indicator_coefficients.csv → ...rter/data/bwfp_indicator_coefficients.csv b/...rter/data/bwfp_indicator_coefficients.csv → ...rter/data/bwfp_indicator_coefficients.csv
diff --git a/...mporter/indicator_coefficient_importer.py → ...mporter/indicator_coefficient_importer.py b/...mporter/indicator_coefficient_importer.py → ...mporter/indicator_coefficient_importer.py
diff --git a/data/requirements.txt → data/importers/requirements.txt b/data/requirements.txt → data/importers/requirements.txt