capytaine 2.2__tar.gz → 2.3__tar.gz

{capytaine-2.2 → capytaine-2.3}/.github/workflows/build_docs.yml

@@ -42,7 +42,10 @@ jobs:
         run: cd docs && make
 
       - name: Deploy pages
-        if: github.ref == 'refs/heads/master'  # Only deploy the version merged into the master branch
+        if: |
+          github.repository_owner == 'capytaine' &&
+          github.ref == 'refs/heads/master'
+        # Only deploy the version merged into the master branch of capytaine/capytaine
         uses: JamesIves/github-pages-deploy-action@releases/v4
         with:
           folder: ./docs/_build/html/

capytaine-2.3/.github/workflows/build_wheels.yaml

@@ -0,0 +1,64 @@
+name: Build wheels
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - v*
+  schedule:
+    - cron: '6 6 6/16 * *'  # On the 6th and 22nd of each month at 6:06
+
+
+jobs:
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-22.04, macos-13, macos-14, windows-2025]
+            # MacOS<=13 are Intel, while MacOS 14 is Apple Silicon
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: fortran-lang/setup-fortran@v1
+        id: setup-fortran
+        with:
+          compiler: 'gcc'
+          version: '13'
+
+      - name: Build wheels on Ubuntu
+        if: matrix.os == 'ubuntu-22.04'
+        uses: pypa/cibuildwheel@v2.21.3
+        env:
+          CIBW_SKIP: "pp* *i686* *musllinux*"
+          # As of Sept 2024, Python 3.13 is troublesome because of lack of Pandas for Python 3.13.
+
+      - name: Build wheels on MacOS Intal
+        if: matrix.os == 'macos-13'
+        uses: pypa/cibuildwheel@v2.21.3
+        env:
+          CIBW_SKIP: "pp*"
+          CIBW_ENVIRONMENT: MACOSX_DEPLOYMENT_TARGET=13.0
+
+      - name: Build wheels on MacOS ARM
+        if: matrix.os == 'macos-14'
+        uses: pypa/cibuildwheel@v2.21.3
+        env:
+          CIBW_SKIP: "pp*"
+          CIBW_ENVIRONMENT: MACOSX_DEPLOYMENT_TARGET=14.0
+
+      - name: Build wheels on Windows
+        if: matrix.os == 'windows-2025'
+        uses: pypa/cibuildwheel@v2.21.3
+        env:
+          CIBW_SKIP: "pp* *win32*"
+          CIBW_BEFORE_BUILD_WINDOWS: pip install delvewheel
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel show {wheel} && delvewheel repair -w {dest_dir} {wheel} --no-mangle-all"
+          # Package the DLL dependencies in the wheel for windows (done by default for the other platforms).
+          # delvewheel cannot mangle the libraries, stripping does not work.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: wheels-${{ matrix.os }}
+          path: ./wheelhouse/*.whl

{capytaine-2.2 → capytaine-2.3}/.github/workflows/test_new_commits.yaml

@@ -38,16 +38,13 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Set up UV
+      uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Set up nox
-      uses: wntrblm/nox@2024.03.02
+        enable-cache: true
 
     - name: Run nox session
-      run: nox -s build_and_test_on_locked_env
+      run: uvx nox --force-python ${{ matrix.python-version }} -s build_and_test_on_locked_env
 
   compile_fortran:
 
@@ -58,14 +55,22 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v4
 
-    - name: Set up Fortran
-      uses: fortran-lang/setup-fortran@v1
-      with:
-        compiler: 'gcc'
-        version: '13'
+    # # 2024-10-22: disabling this step because it takes a few minutes to
+    # download a specific version of GCC, but it is not really required as GCC
+    # is already installed on the Ubuntu runner.
+    #
+    # - name: Set up Fortran
+    #   uses: fortran-lang/setup-fortran@v1
+    #   with:
+    #     compiler: 'gcc'
+    #     version: '13'
 
     - name: Compile and run example
       working-directory: capytaine/green_functions/libDelhommeau/
       run: make example && examples/minimal/minimal_example.bin
       # Soundness of the results is not tested, only that the compiling and
       # execution are succeeding.
+
+    - name: Run simple benchmark
+      working-directory: capytaine/green_functions/libDelhommeau/
+      run: make run_bench_rankine && make run_bench_waves

{capytaine-2.2 → capytaine-2.3}/.github/workflows/test_with_latest_dependencies.yaml

@@ -16,20 +16,17 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.8', '3.12']
+        python-version: ['3.8', '3.13']
 
     steps:
 
     - name: Checkout repository and submodules
       uses: actions/checkout@v4
 
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+    - name: Set up UV
+      uses: astral-sh/setup-uv@v5
       with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Set up nox
-      uses: wntrblm/nox@2024.03.02
+        enable-cache: true
 
     - name: Run nox session
-      run: nox -s build_and_test_on_latest_env editable_build_and_test_on_latest_env
+      run: uvx nox --force-python ${{ matrix.python-version }} -s build_and_test_on_latest_env editable_build_and_test_on_latest_env

{capytaine-2.2 → capytaine-2.3}/.gitignore

@@ -1,3 +1,4 @@
+uv.lock
 .idea/
 pytest/Nemoh_verification_cases/*/results/
 docs/_static/

{capytaine-2.2 → capytaine-2.3}/.pre-commit-config.yaml

@@ -37,4 +37,4 @@ repos:
     rev: "v2.2.5"
     hooks:
       - id: codespell
-        args: ["-L", "ba,informations,inout,ist,lamda,ment,noe,periode,sur", "--skip", "capytaine/green_functions/libDelhommeau/src/old_Prony_decomposition.f90"]
+        args: ["-L", "ans,ba,informations,inout,ist,lamda,ment,noe,periode,sur", "--skip", "capytaine/green_functions/libDelhommeau/src/old_Prony_decomposition.f90"]

capytaine-2.3/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# How to contribute
+
+Thank you for your interest into Capytaine.
+
+## Contact
+
+The best place to report a bug or to propose an enhancement is the [issue
+tracker](https://github.com/mancellin/capytaine/issues) of Capytaine's Github
+repository.
+
+The [discussion page](https://github.com/mancellin/capytaine/discussions) can
+also be used to ask questions and submit ideas.
+
+## Submitting changes
+
+Pull requests are welcome.
+See the [developer manual](https://capytaine.org/master/developer_manual) for
+instructions.

{capytaine-2.2 → capytaine-2.3}/Makefile

@@ -2,8 +2,10 @@ install:
 	pip install .
 
 develop:
-	pip install -r editable_install_requirements.txt
+	uv pip install -r editable_install_requirements.txt
+	uv pip install .[test,optional,more_optional]
 	pip install --no-build-isolation --editable .
+	# The last line is not support by uv
 
 TEMP_DIR := $(shell mktemp -d)
 test_fortran_compilation:
@@ -13,7 +15,7 @@ test_fortran_compilation:
 
 test:
 	# Build and test the current repository in a fixed environment.
-	nox -s build_and_test_on_locked_env
+	uvx nox --python 3.12 --session build_and_test_on_locked_env
 
 clean:
 	rm -f capytaine/green_functions/libs/*.so