Chore: Tidy up build environment

Signed-off-by: ModeSevenIndustrialSolutions <93649628+ModeSevenIndustrialSolutions@users.noreply.github.com>
os-climate · Sep 20, 2023 · f918ece · f918ece
1 parent 84ae7f1
commit f918ece
Show file tree

Hide file tree

Showing 21 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml
@@ -1,7 +1,11 @@
 ---
 name: "🧪 Linting checks"
 
-on: push  # yamllint disable-line rule:truthy
+# yamllint disable-line rule:truthy
+on:
+  pull_request:
+    types:
+      [opened, reopened, edited]
 
 jobs:
   lint:

diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ __pycache__/
 .pdm-python
 build/
 develop-eggs/
-dist/.*
+dist/**
 !app/static/frontend/dist/
 downloads/
 eggs/

diff --git a/pyproject.toml b/pyproject.toml
@@ -41,16 +41,16 @@ dev = [ "nose2" ]
 
 [build-system]
 requires = [
-  "setuptools>=65.7.0",
-  "setuptools-scm"
+  # "setuptools>=65.7.0",
+  # "setuptools-scm",
+  "pdm-backend"
 ]
-build-backend = "setuptools.build_meta"
-# requires = ["pdm-backend"]
-# build-backend = "pdm.backend"
+# build-backend = "setuptools.build_meta"
+build-backend = "pdm.backend"
 
 [tool.pdm.build]
 dependencies = { file = [ "requirements-dev.txt" ] }
-source-includes = [ "ITR" ]
+# source-includes = [ "ITR" ]
 run-setuptools = true
 
 [tool.setuptools.dynamic]

diff --git a/src/ITR b/src/ITR
diff --git a/ITR/__init__.py → src/ITR/__init__.py b/ITR/__init__.py → src/ITR/__init__.py
diff --git a/ITR/configs.py → src/ITR/configs.py b/ITR/configs.py → src/ITR/configs.py
diff --git a/ITR/data/__init__.py → src/ITR/data/__init__.py b/ITR/data/__init__.py → src/ITR/data/__init__.py
diff --git a/ITR/data/base_providers.py → src/ITR/data/base_providers.py b/ITR/data/base_providers.py → src/ITR/data/base_providers.py
diff --git a/ITR/data/data_providers.py → src/ITR/data/data_providers.py b/ITR/data/data_providers.py → src/ITR/data/data_providers.py
diff --git a/ITR/data/data_warehouse.py → src/ITR/data/data_warehouse.py b/ITR/data/data_warehouse.py → src/ITR/data/data_warehouse.py
diff --git a/ITR/data/excel.py → src/ITR/data/excel.py b/ITR/data/excel.py → src/ITR/data/excel.py
diff --git a/ITR/data/input/country_region_info.csv → src/ITR/data/input/country_region_info.csv b/ITR/data/input/country_region_info.csv → src/ITR/data/input/country_region_info.csv
diff --git a/ITR/data/input/oecd_iso.csv → src/ITR/data/input/oecd_iso.csv b/ITR/data/input/oecd_iso.csv → src/ITR/data/input/oecd_iso.csv
diff --git a/ITR/data/input/region_classification.csv → src/ITR/data/input/region_classification.csv b/ITR/data/input/region_classification.csv → src/ITR/data/input/region_classification.csv
diff --git a/ITR/data/osc_units.py → src/ITR/data/osc_units.py b/ITR/data/osc_units.py → src/ITR/data/osc_units.py
diff --git a/ITR/data/template.py → src/ITR/data/template.py b/ITR/data/template.py → src/ITR/data/template.py
diff --git a/ITR/data/vault_providers.py → src/ITR/data/vault_providers.py b/ITR/data/vault_providers.py → src/ITR/data/vault_providers.py
diff --git a/ITR/interfaces.py → src/ITR/interfaces.py b/ITR/interfaces.py → src/ITR/interfaces.py
diff --git a/ITR/portfolio_aggregation.py → src/ITR/portfolio_aggregation.py b/ITR/portfolio_aggregation.py → src/ITR/portfolio_aggregation.py
diff --git a/ITR/temperature_score.py → src/ITR/temperature_score.py b/ITR/temperature_score.py → src/ITR/temperature_score.py
diff --git a/ITR/utils.py → src/ITR/utils.py b/ITR/utils.py → src/ITR/utils.py