From 2f5a157b91237056003cd9f09d4fb44988d0f512 Mon Sep 17 00:00:00 2001 From: Zhang Yunjun Date: Mon, 21 Nov 2022 20:03:49 -0800 Subject: [PATCH 1/2] README: use
tag for "build from source" --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e85a081..41df868 100644 --- a/README.md +++ b/README.md @@ -25,9 +25,8 @@ or via `apt` (or other package managers) for [Debian-derivative OS](https://wiki apt install python3-pysolid ``` -Installing via `conda` and `apt` is recommended because PySolid contains Fortran source code, which required compilation. Otherwise, you may build it from source as described below. - -#### 1.1 Build from source +
+Or build from source: PySolid relies on a few Python modules as described in [requirements.txt](./requirements.txt) and [NumPy's f2py](https://numpy.org/doc/stable/f2py/) to build the Fortran source code. You could use `conda` to install all the dependencies, including the Fortran compiler, or use your own installed Fortran compiler and `pip` to install the rest. @@ -69,7 +68,7 @@ f2py -c -m solid solid.for export PYTHONPATH=${PYTHONPATH}:~/tools/PySolid ``` -#### 1.2 Test the installation +##### d. Test the installation To test the installation, run the following: @@ -78,6 +77,7 @@ python -c "import pysolid; print(pysolid.__version__)" python PySolid/tests/grid.py python PySolid/tests/point.py ``` +
### 2. Usage From d16a5e09d62dfb215bf79becc369334979de00a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Dec 2022 06:05:32 +0000 Subject: [PATCH 2/2] build(deps): bump pypa/cibuildwheel from 2.11.2 to 2.11.4 Bumps [pypa/cibuildwheel](https://github.com/pypa/cibuildwheel) from 2.11.2 to 2.11.4. - [Release notes](https://github.com/pypa/cibuildwheel/releases) - [Changelog](https://github.com/pypa/cibuildwheel/blob/main/docs/changelog.md) - [Commits](https://github.com/pypa/cibuildwheel/compare/v2.11.2...v2.11.4) --- updated-dependencies: - dependency-name: pypa/cibuildwheel dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/build-and-publish-to-pypi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish-to-pypi.yml b/.github/workflows/build-and-publish-to-pypi.yml index 3b13920..5282df3 100644 --- a/.github/workflows/build-and-publish-to-pypi.yml +++ b/.github/workflows/build-and-publish-to-pypi.yml @@ -43,7 +43,7 @@ jobs: echo "[build]`ncompiler=mingw32" | Out-File -Encoding ASCII ~/pydistutils.cfg - name: Build wheels - uses: pypa/cibuildwheel@v2.11.2 + uses: pypa/cibuildwheel@v2.11.4 env: # Disable building for PyPy and 32bit. CIBW_SKIP: pp* *-win32 *-manylinux_i686