Merge branch 'main' into refactor_test_pipeline

Signed-off-by: Adam Kells <adam.kells@artefact.com>

.github/workflows/all-checks.yml

@@ -25,40 +25,40 @@ jobs:
   unit-tests:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ windows-latest, ubuntu-latest ]
         python-version: [ "3.8", "3.9", "3.10", "3.11" ]
     uses: ./.github/workflows/unit-tests.yml
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
       branch: ${{ inputs.branch }}
-
-  lint:
+  e2e-tests:
     strategy:
       matrix:
-        os: [ ubuntu-latest ]
-        python-version: [ "3.11" ]
-    uses: ./.github/workflows/lint.yml
+        os: [ windows-latest, ubuntu-latest ]
+        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
+    uses: ./.github/workflows/e2e-tests.yml
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
       branch: ${{ inputs.branch }}
 
-  e2e-tests:
+  lint:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
-        python-version: [ "3.8", "3.9", "3.10", "3.11" ]
-    uses: ./.github/workflows/e2e-tests.yml
+        os: [ ubuntu-latest ]
+        python-version: [ "3.11" ]
+    uses: ./.github/workflows/lint.yml
     with:
       os: ${{ matrix.os }}
       python-version: ${{ matrix.python-version }}
       branch: ${{ inputs.branch }}
 
+
   pip-compile:
     strategy:
       matrix:
-        os: [ ubuntu-latest, windows-latest ]
+        os: [ windows-latest, ubuntu-latest ]
         python-version: [ "3.8", "3.9", "3.10", "3.11" ]
     uses: ./.github/workflows/pip-compile.yml
     with:

.github/workflows/unit-tests.yml

@@ -47,8 +47,8 @@ jobs:
       - name: pip freeze
         run: pip freeze
       - name: Run unit tests
-        if: inputs.os == 'ubuntu-latest'
+        if: inputs.os == 'ubuntu-latest' || inputs.branch == 'develop'
         run: make test
       - name: Run unit tests without spark (Windows)
-        if: inputs.os == 'windows-latest'
+        if: inputs.os == 'windows-latest' && inputs.branch != 'develop'
         run: make test-no-spark

docs/source/development/set_up_vscode.md

@@ -109,7 +109,8 @@ PYTHONPATH=C:/path/to/project/src;%PYTHONPATH%
 
 You can find [more information about setting up environmental variables in the VSCode documentation](https://code.visualstudio.com/docs/python/environments#_environment-variable-definitions-file).
 
-Go to **Debug > Add Configurations**.
+Click on the **Run and Debug** icon on the left activity bar (press `Cmd + Shift + D` for macOS). If there is no existing configuration, click on **create a launch.json file** else click on the dropdown arrow in the top-left (shown below) and click **Add Configuration** .
+![](../meta/images/vscode_add_configuration.png)
 
 ```{note}
 If you encounter the following error: `Cannot read property 'openConfigFile' of undefined`, you can manually create `launch.json` file in `.vscode` directory and paste the configuration from below.