CI: Put Spyder source tree outside the plugin source tree

Before, the Spyder source tree was nested inside the plugin source
tree which was messy and may have generated errors.

Author: jitseniesen

.github/scripts/generate-without-spyder.py

@@ -7,11 +7,15 @@
 """Script to generate requirements/without-spyder.txt"""
 
 import re
+from pathlib import Path
 
-with open('requirements/conda.txt') as infile:
-    with open('requirements/without-spyder.txt', 'w') as outfile:
+rootdir = Path(__file__).parents[2]
+input_filename = rootdir / 'requirements' / 'conda.txt'
+output_filename = rootdir / 'requirements' / 'without-spyder.txt'
+
+with open(input_filename) as infile:
+    with open(output_filename, 'w') as outfile:
         for line in infile:
             package_name = re.match('[-a-z0-9_]*', line).group(0)
             if package_name != 'spyder':
                 outfile.write(line)
-

.github/workflows/run-tests.yml

@@ -24,6 +24,8 @@ jobs:
     steps:
       - name: Checkout branch
         uses: actions/checkout@v4
+        with:
+          path: spyder-notebook
       - name: Install System Packages
         if: matrix.OS == 'ubuntu'
         run: | 
@@ -32,8 +34,8 @@ jobs:
       - name: Install Conda
         uses: conda-incubator/setup-miniconda@v3
         with:
-           auto-update-conda: true
-           python-version: ${{ matrix.PYTHON_VERSION }} 
+          auto-update-conda: true
+          python-version: ${{ matrix.PYTHON_VERSION }} 
       - name: Checkout Spyder from git
         if: matrix.SPYDER_SOURCE == 'git'
         uses: actions/checkout@v4
@@ -63,26 +65,26 @@ jobs:
         if: matrix.SPYDER_SOURCE == 'git'
         shell: bash -l {0}
         run: |
-          python .github/scripts/generate-without-spyder.py
-          conda install --file requirements/without-spyder.txt -y
+          python spyder-notebook/.github/scripts/generate-without-spyder.py
+          conda install --file spyder-notebook/requirements/without-spyder.txt -y
       - name: Install plugin dependencies
         if: matrix.SPYDER_SOURCE == 'conda'
         shell: bash -l {0}
-        run: conda install --file requirements/conda.txt -y
+        run: conda install --file spyder-notebook/requirements/conda.txt -y
       - name: Install test dependencies
         shell: bash -l {0}
         run: |
           conda install nomkl -y -q
-          conda install --file requirements/tests.txt -y
+          conda install --file spyder-notebook/requirements/tests.txt -y
       - name: Build JavaScript
         shell: bash -l {0}
         run: |
-          cd spyder_notebook/server
+          cd spyder-notebook/spyder_notebook/server
           jlpm install
           jlpm build
       - name: Install plugin
         shell: bash -l {0}
-        run: pip install --no-deps -e .
+        run: pip install --no-deps -e spyder-notebook
       - name: Show environment information
         shell: bash -l {0}
         run: |
@@ -97,7 +99,7 @@ jobs:
           shell: bash
           command: |
             . ~/.profile
-            xvfb-run --auto-servernum pytest spyder_notebook --cov=spyder_notebook --cov-report=xml -vv
+            xvfb-run --auto-servernum pytest spyder-notebook/spyder_notebook -vv
       - name: Run tests (MacOS)
         if: matrix.OS == 'macos'
         uses: nick-fields/retry@v3
@@ -107,11 +109,11 @@ jobs:
           shell: bash
           command: |
             . ~/.profile
-            pytest spyder_notebook -vv
+            pytest spyder-notebook/spyder_notebook -vv
       - name: Run tests (Windows)
         if: matrix.OS == 'windows'
         uses: nick-fields/retry@v3
         with:
           timeout_minutes: 10
           max_attempts: 3
-          command: pytest spyder_notebook -vv
+          command: pytest spyder-notebook/spyder_notebook -vv