Remove setup.py calls in bleeding-edge workflow

yt-project · May 13, 2024 · a0f73cc · a0f73cc
1 parent 333621b
commit a0f73cc
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/.github/workflows/bleeding-edge.yaml b/.github/workflows/bleeding-edge.yaml
@@ -61,13 +61,17 @@ jobs:
       # are not installed by pip as specified from pyproject.toml, hence we get
       # to use the dev version of numpy at build time.
       run: |
+<<<<<<< HEAD
 <<<<<<< HEAD
         python -m pip -v install -e .[test] --no-build-isolation
 =======
         python setup.py build_clib -q
         python setup.py build_ext -q -j2
         python -m pip install -e .[test] --no-build-isolation
 >>>>>>> da7d2bf82 (BLD: fix bleeding-edge build script)
+=======
+        python -m pip -v install -e .[test] --no-build-isolation
+>>>>>>> 58d0ab9fd (Remove setup.py calls in bleeding-edge workflow)
 
     - run: python -m pip list