diff options
| -rw-r--r-- | .github/workflows/linux_meson.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/linux_musl.yml | 4 | ||||
| -rw-r--r-- | build_requirements.txt | 2 | ||||
| -rw-r--r-- | building_with_meson.md | 8 | ||||
| -rwxr-xr-x | spin | 19 |
5 files changed, 9 insertions, 28 deletions
diff --git a/.github/workflows/linux_meson.yml b/.github/workflows/linux_meson.yml index 902c06997..7f67f1b0b 100644 --- a/.github/workflows/linux_meson.yml +++ b/.github/workflows/linux_meson.yml @@ -41,7 +41,7 @@ jobs: env: TERM: xterm-256color run: - ./spin build -- --werror + spin build -- --werror - name: Check build-internal dependencies run: ninja -C build -t missingdeps @@ -54,4 +54,4 @@ jobs: TERM: xterm-256color run: | pip install pytest hypothesis typing_extensions - ./spin test + spin test diff --git a/.github/workflows/linux_musl.yml b/.github/workflows/linux_musl.yml index 54c8b7c2d..7d90c20ed 100644 --- a/.github/workflows/linux_musl.yml +++ b/.github/workflows/linux_musl.yml @@ -62,5 +62,5 @@ jobs: pip install pytest hypothesis typing_extensions # use meson to build and test - ./spin build - ./spin test + spin build + spin test diff --git a/build_requirements.txt b/build_requirements.txt index 3699320c8..5c2a1c271 100644 --- a/build_requirements.txt +++ b/build_requirements.txt @@ -2,4 +2,4 @@ meson-python>=0.10.0 Cython>=0.29.30,<3.0 wheel==0.38.1 ninja -spin>=0.2 +spin>=0.3 diff --git a/building_with_meson.md b/building_with_meson.md index cf198e7d9..259498998 100644 --- a/building_with_meson.md +++ b/building_with_meson.md @@ -18,14 +18,14 @@ into a problem._ Then install spin: - `python -m pip install spin` -**Compile and install:** `./spin build` +**Compile and install:** `spin build` This builds in the `build/` directory, and installs into the `build-install` directory. Then run the test suite or a shell via `spin`: ``` -./spin test -./spin ipython +spin test +spin ipython ``` Alternatively, to use the package, add it to your `PYTHONPATH`: @@ -67,5 +67,5 @@ Libs: -L${libdir} -lopenblas Then build with: ``` -./spin build -- -Dpkg_config_path=${HOME}/lib/pkgconfig +spin build -- -Dpkg_config_path=${HOME}/lib/pkgconfig ``` @@ -1,19 +0,0 @@ -#!/usr/bin/env python -# -# Example stub for running `python -m spin` -# -# Copy this into your project root. - -import os -import sys -import runpy - -sys.path.remove(os.path.abspath(os.path.dirname(sys.argv[0]))) -try: - runpy.run_module("spin", run_name="__main__") -except ImportError: - print("Cannot import spin; please install it using") - print() - print(" pip install spin") - print() - sys.exit(1) |