Merge pull request #39 from BasisResearch/ru-add-gdp

aggregated a number of PRs, this now lives in ru-add-gdp, should land in main

.github/workflows/python-app.yml

@@ -26,14 +26,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install flake8 pytest
         if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-    - name: Lint with flake8
+        pip install -e .
+    - name: Lint
       run: |
-        # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        ./scripts/lint.sh
     - name: Test with pytest
       run: |
         cd tests && python -m pytest && cd ..

.gitignore

@@ -3,18 +3,16 @@ venv
 
 
 
-
-
-
+cities.egg-info/*
+cities.egg-info/
+*/__pycache__
 *.pyc
 **/*.pyc 
 tests/__pycache__/
-tests/__pycache__/test_data_grabber.cpython-310-pytest-7.2.0.pyc
-tests/__pycache__/test_cleaning_utils.cpython-310-pytest-7.2.0.pyc
+
 .vscode/settings.json
-cities/utils/__pycache__/__init__.cpython-310.pyc
-cities/utils/__pycache__/__init__.cpython-310.pyc
-cities/utils/__pycache__/cleaning_utils.cpython-310.pyc
-cities/utils/__pycache__/data_grabber.cpython-310.pyc
-tests/__pycache__/test_cleaning_utils.cpython-310-pytest-7.2.0.pyc
-tests/__pycache__/test_data_grabber.cpython-310-pytest-7.2.0.pyc
+tests/.coverage
+tests/pytest_report/
+tests/.pytest_cache/
+cities.egg-info/SOURCES.txt
+tests/.coverage

Makefile

@@ -0,0 +1,10 @@
+lint: FORCE
+	./scripts/lint.sh
+
+format:
+	./scripts/clean.sh
+
+test: FORCE 
+	./scripts/test.sh
+
+FORCE: