Merge pull request #321 from insight-lane/setup_tox

General repository cleanup
insight-lane · May 12, 2024 · 39b9c69 · 39b9c69
2 parents 8f9f23d + 883bb1a
commit 39b9c69
Show file tree

Hide file tree

Showing 42 changed files with 498 additions and 1,671 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -22,11 +22,14 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v2
       with:
         auto-update-conda: false
-        activate-environment: crash-model
-        environment-file: conda-linux-64.lock
+        # activate-environment: crash-model
+        # environment-file: conda-linux-64.lock
+        channels: conda-forge, defaults
+        channel-priority: strict
     - name: Run linux tests
       run: |
         set -eo pipefail
+        conda env create --name crash-model -f requirements.txt
         conda activate crash-model
         cd src
         py.test --cov=./ --cov-report=xml
@@ -47,35 +50,38 @@ jobs:
     - uses: conda-incubator/setup-miniconda@v2
       with:
         auto-update-conda: true
-        activate-environment: crash-model
-        environment-file: conda-osx-64.lock
+        #activate-environment: crash-model
+        #environment-file: conda-osx-64.lock
+        #environment-file: environment_mac.yml
         channels: conda-forge, defaults
         channel-priority: strict
     - name: Run mac tests
       run: |
         set -eo pipefail
         . /usr/local/miniconda/etc/profile.d/conda.sh
         sudo chown -R $USER $CONDA
+        conda env create --name crash-model -f requirements.txt
         conda activate crash-model
         cd src
-        pylint pipeline.py initialize_city.py data/*.py visualization/*.py data_standardization/*.py models/*.py features/*.py tools/*.py
-        py.test
-  windows:
-    env:
-      PYTHONFAULTHANDLER: "true"
-    runs-on: windows-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: conda-incubator/setup-miniconda@v2
-      with:
-        auto-update-conda: true
-        activate-environment: crash-model
-        environment-file: conda-win-64.lock
-
-    - name: Run windows tests
-      shell: bash -l {0}
-      run: |
-        set -eo pipefail
-        cd src
-        pylint pipeline.py initialize_city.py data/*.py visualization/*.py data_standardization/*.py models/*.py features/*.py tools/*.py
-        py.test
+        pytest
+  # unclear that we need to test on windows
+  # windows:
+  #   env:
+  #     PYTHONFAULTHANDLER: "true"
+  #   runs-on: windows-latest
+  #   steps:
+  #   - uses: actions/checkout@v2
+  #   - uses: conda-incubator/setup-miniconda@v2
+  #     with:
+  #       auto-update-conda: true
+  #       #activate-environment: crash-model
+  #       #environment-file: conda-win-64.lock
+  #       channels: conda-forge, defaults
+  #       channel-priority: strict
+  #   - name: Run windows tests
+  #     shell: bash -l {0}
+  #     run: |
+  #       set -eo pipefail
+  #       conda env create --name crash-model -f requirements.txt
+  #       cd src
+  #       py.test
diff --git a/.gitignore b/.gitignore
@@ -94,4 +94,4 @@ ENV/
 Scripts
 
 # Data
-data/
+/data/
diff --git a/Makefile b/Makefile
diff --git a/data_generation/tests/__init__.py b/data_generation/tests/__init__.py
diff --git a/data_generation/tests/test_create_segments.py b/data_generation/tests/test_create_segments.py
diff --git a/data_generation/tests/test_extract_intersections.py b/data_generation/tests/test_extract_intersections.py