Revert "Install editable for pytest in CI"

This reverts commit f8abfa9.
inducer · Nov 5, 2023 · 4e0b1c7 · 4e0b1c7
1 parent f8abfa9
commit 4e0b1c7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 82 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -59,12 +59,6 @@ jobs:
         -   name: "Main Script"
             run: |
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
-
-                # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-                # is importable both from a venv and the subdirectory.
-                # -AK, 2023-11-01
-                PROJECT_INSTALL_FLAGS="--editable"
-
                 . ./build-and-test-py-project-within-miniconda.sh
 
     pytest_intel:
@@ -83,12 +77,6 @@ jobs:
                 source /opt/enable-intel-cl.sh
                 curl -L -O https://tiker.net/ci-support-v0
                 . ./ci-support-v0
-
-                # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-                # is importable both from a venv and the subdirectory.
-                # -AK, 2023-11-01
-                PROJECT_INSTALL_FLAGS="--editable"
-
                 build_py_project_in_conda_env
                 test_py_project
 
@@ -101,12 +89,6 @@ jobs:
             run: |
                 curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
                 export _LOOPY_SKIP_ARG_CHECKS=1
-
-                # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-                # is importable both from a venv and the subdirectory.
-                # -AK, 2023-11-01
-                PROJECT_INSTALL_FLAGS="--editable"
-
                 . ./build-and-test-py-project-within-miniconda.sh
 
     pytest_twice:
@@ -117,12 +99,6 @@ jobs:
         -   name: "Main Script"
             run: |
                 curl -L -O https://tiker.net/ci-support-v0
-
-                # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-                # is importable both from a venv and the subdirectory.
-                # -AK, 2023-11-01
-                PROJECT_INSTALL_FLAGS="--editable"
-
                 . ./ci-support-v0
                 build_py_project_in_conda_env
                 ( test_py_project )

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,16 +1,10 @@
 Pytest POCL:
-  script: |
-    export PYOPENCL_TEST=portable:pthread
-    export EXTRA_INSTALL="pybind11 numpy mako"
-    export LOOPY_NO_CACHE=1
-    curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-
-    # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-    # is importable both from a venv and the subdirectory.
-    # -AK, 2023-11-01
-    PROJECT_INSTALL_FLAGS="--editable"
-
-    . ./build-and-test-py-project.sh
+  script:
+  - export PYOPENCL_TEST=portable:pthread
+  - export EXTRA_INSTALL="pybind11 numpy mako"
+  - export LOOPY_NO_CACHE=1
+  - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
   tags:
   - python3
   - pocl
@@ -21,19 +15,13 @@ Pytest POCL:
       junit: test/pytest.xml
 
 Pytest Nvidia Titan V:
-  script: |
-    export PYOPENCL_TEST=nvi:titan
-    export EXTRA_INSTALL="pybind11 numpy mako"
-    export LOOPY_NO_CACHE=1
-    source /opt/enable-intel-cl.sh
-    curl -L -O https://gitlab.tiker."net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-
-    # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-    # is importable both from a venv and the subdirectory.
-    # -AK, 2023-11-01
-    PROJECT_INSTALL_FLAGS="--editable"
-
-    . ./build-and-test-py-project.sh
+  script:
+  - export PYOPENCL_TEST=nvi:titan
+  - export EXTRA_INSTALL="pybind11 numpy mako"
+  - export LOOPY_NO_CACHE=1
+  - source /opt/enable-intel-cl.sh
+  - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
   tags:
   - python3
   - nvidia-titan-v
@@ -44,19 +32,13 @@ Pytest Nvidia Titan V:
       junit: test/pytest.xml
 
 Pytest POCL without arg check:
-  script: |
-    export PYOPENCL_TEST=portable:pthread
-    export EXTRA_INSTALL="pybind11 numpy mako"
-    export LOOPY_NO_CACHE=1
-    export _LOOPY_SKIP_ARG_CHECKS=1
-    curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-
-    # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-    # is importable both from a venv and the subdirectory.
-    # -AK, 2023-11-01
-    PROJECT_INSTALL_FLAGS="--editable"
-
-    . ./build-and-test-py-project.sh
+  script:
+  - export PYOPENCL_TEST=portable:pthread
+  - export EXTRA_INSTALL="pybind11 numpy mako"
+  - export LOOPY_NO_CACHE=1
+  - export _LOOPY_SKIP_ARG_CHECKS=1
+  - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
   tags:
   - python3
   - pocl
@@ -67,20 +49,14 @@ Pytest POCL without arg check:
       junit: test/pytest.xml
 
 Pytest Intel:
-  script: |
-    export PYOPENCL_TEST=intel
-    export EXTRA_INSTALL="pybind11 numpy mako"
-    export LOOPY_NO_CACHE=1
-    export LOOPY_INTEL_CL_OK_FOR_TEST_REF=1
-    source /opt/enable-intel-cl.sh
-    curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
-
-    # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-    # is importable both from a venv and the subdirectory.
-    # -AK, 2023-11-01
-    PROJECT_INSTALL_FLAGS="--editable"
-
-    . ./build-and-test-py-project.sh
+  script:
+  - export PYOPENCL_TEST=intel
+  - export EXTRA_INSTALL="pybind11 numpy mako"
+  - export LOOPY_NO_CACHE=1
+  - export LOOPY_INTEL_CL_OK_FOR_TEST_REF=1
+  - source /opt/enable-intel-cl.sh
+  - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh
+  - ". ./build-and-test-py-project.sh"
   tags:
   - python3
   - intel-cl-cpu
@@ -97,12 +73,6 @@ Pytest POCL Twice With Cache:
     export EXTRA_INSTALL="pybind11 numpy mako"
     curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh
     . ./ci-support.sh
-
-    # Pytest gripes about ImportPathMismatchError if 'loopy.xyz'
-    # is importable both from a venv and the subdirectory.
-    # -AK, 2023-11-01
-    PROJECT_INSTALL_FLAGS="--editable"
-
     build_py_project_in_venv
     ( test_py_project )
     ( test_py_project )