Merge branch 'Feature_build_system'

Author: ymd-h

.github/workflows/build.yml

@@ -16,123 +16,96 @@ jobs:
         with:
           name: README
           path: README.md
-  test:
+  build_wheel:
+    needs: readme
     strategy:
       matrix:
-        runs-on: [ubuntu-latest, macos-13, macos-14, windows-latest]
+        runs-on: [macos-13, macos-14, windows-latest, ubuntu-latest]
       fail-fast: false
     runs-on: ${{ matrix.runs-on }}
     steps:
       - uses: actions/checkout@v4
-      - name: Install Hatch
-        uses: pypa/hatch@install
-      - name: Run Test
-        run: |
-          hatch run test:install
-          hatch run test-38:install
-          hatch run test:run-cov
-          hatch run test-38:run-cov
-          hatch run cov:combine
-          echo '## Test Coverage on ${{ matrix.runs-on }}' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          hatch -q run cov:report >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
+      - uses: actions/download-artifact@v4
+        with:
+          name: README
+          path: README
+      - run: mv README/README.md README.md
+      - uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+          cache-dependency-glob: |
+            **/pyproject.toml
+            **/setup.py
+      - run: uvx -p 3.12 cibuildwheel
         shell: bash
-  build_winmac:
+      - uses: actions/upload-artifact@v4
+        with:
+          name: dist-${{ matrix.runs-on }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
+  build_aarch64:
     needs: readme
     strategy:
       matrix:
-        runs-on: [macos-13, macos-14, windows-latest]
+        py: ['39', '310', '311', '312', '313']
       fail-fast: false
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: |
-            3.8
-            3.9
-            3.10
-            3.11
-            3.12
-          cache: 'pip'
       - uses: actions/download-artifact@v4
         with:
           name: README
           path: README
       - run: mv README/README.md README.md
-      - run: pip3.8 wheel . -w dist --no-deps
-      - run: pip3.9 wheel . -w dist --no-deps
-      - run: pip3.10 wheel . -w dist --no-deps
-      - run: pip3.11 wheel . -w dist --no-deps
-      - run: pip3.12 wheel . -w dist --no-deps
+      - uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+          cache-dependency-glob: |
+            **/pyproject.toml
+            **/setup.py
+      - uses: docker/setup-qemu-action@v3
+        with:
+          platforms: all
+      - run: uvx -p 3.12 cibuildwheel
+        shell: bash
+        env:
+          CIBW_BUILD: ${{'cp'}}${{ matrix.py }}${{'-????linux_*64'}}
+          CIBW_ARCHS_LINUX: aarch64
       - uses: actions/upload-artifact@v4
         with:
-          name: dist-${{ matrix.runs-on }}
-          path: dist
-      - name: Upload to PyPI
-        run: |
-          pip install twine
-          python -m twine upload -u __token__ -p ${{ secrets.pypi_password }} --skip-existing dist/cpprb-*
-        if: github.event_name == 'push' && startsWith(github.event.ref,'refs/tags/v')
+          name: dist-aarch64-${{ matrix.py }}-${{ strategy.job-index }}
+          path: ./wheelhouse/*.whl
   build_targz:
     needs: readme
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.8'
-          cache: 'pip'
       - uses: actions/download-artifact@v4
         with:
           name: README
           path: README
       - run: mv README/README.md README.md
-      - run: python setup.py build_ext sdist
+      - uses: astral-sh/setup-uv@v4
+        with:
+          enable-cache: true
+          cache-dependency-glob: |
+            **/pyproject.toml
+            **/setup.py
+      - run: uv run --no-project --with build python -m build --sdist
       - uses: actions/upload-artifact@v4
         with:
           name: dist-sdist
-          path: dist
-      - run: pip --disable-pip-version-check install twine
-      - name: Upload to PyPI
-        run: python -m twine upload -u __token__ -p ${{ secrets.pypi_password }} --skip-existing dist/cpprb-*tar.gz
-        if: github.event_name == 'push' && startsWith(github.event.ref,'refs/tags/v')
-  build_manylinux:
+          path: dist/*.tar.gz
+  upload:
+    needs: [build_wheel, build_aarch64, build_targz]
+    environment: pypi
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        arch: ["x86_64", "aarch64"]
+    permissions:
+      id-token: write
+    if: github.event_name == 'push' && startsWith(github.event.ref,'refs/tags/v')
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3'
-          cache: 'pip'
-      - uses: docker/setup-qemu-action@v3
-        if: ${{ matrix.arch }} == "aarch64"
-        with:
-          platforms: arm64
-      - uses: docker/setup-buildx-action@v3
-      - uses: docker/build-push-action@v5
-        with:
-          push: false
-          build-args: |
-            ON_CI=1
-            arch=${{ matrix.arch }}
-          file: Dockerfile
-          cache-to: type=gha,mode=max,scope=${{github.ref_name}}
-          cache-from: type=gha,scope=${{github.ref_name}}
-          load: true
-          tags: cpprb/wheel:latest
-      - run: |
-          docker create --name wheel cpprb/wheel:latest
-          docker cp wheel:/dist/. dist/
-      - uses: actions/upload-artifact@v4
+      - uses: actions/download-artifact@v4
         with:
-          name: dist-manylinux-${{ matrix.arch }}
+          pattern: 'dist-*'
           path: dist
-      - run: pip --disable-pip-version-check install twine
-      - name: Upload to PyPI
-        run: python -m twine upload -u __token__ -p ${{ secrets.pypi_password }} --skip-existing dist/cpprb-*
-        if: github.event_name == 'push' && startsWith(github.event.ref,'refs/tags/v')
+          merge-multiple: true
+      - uses: pypa/gh-action-pypi-publish@release/v1

.gitignore

@@ -1,6 +1,7 @@
 .coverage*
 build
 dist
+wheelhouse
 *egg-info
 *.so
 *.c

.gitlab-ci.yml

@@ -64,7 +64,7 @@ hugo:
   script:
     - hugo version
     - cd site
-    - hugo -c content -v
+    - hugo -c content --logLevel info
   artifacts:
     paths:
       - public
@@ -78,7 +78,7 @@ sphinx:
   stage: page_build
   environment: production
   script:
-    - pip install $(echo dist/*.whl)['all']
+    - pip install $(echo dist/*.whl) "sphinx" "sphinx_rtd_theme" "sphinx-automodapi"
     - sphinx-build -b html sphinx public/api
   artifacts:
     paths:

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "themes/learn"]
-	path = site/themes/learn
-	url = https://github.com/matcornic/hugo-theme-learn.git
+[submodule "hugo-theme-relearn"]
+	path = site/themes/hugo-theme-relearn
+	url = https://github.com/McShelby/hugo-theme-relearn.git

Dockerfile

@@ -20,19 +20,6 @@ RUN ON_CI=${ON_CI} /opt/python/cp38-cp38/bin/pip wheel . -w /work/wheel --no-dep
     auditwheel repair /work/wheel/cpprb-*.whl -w /dist
 
 
-FROM python:latest AS test
-WORKDIR /work
-RUN --mount=type=cache,target=/root/.cache/pip \
-    pip install hatch
-COPY pyproject.tom setup.py LICENSE MANIFEST.in .
-COPY src src/
-RUN hatch env create test
-COPY test test/
-RUN hatch run test:run-cov && \
-    hatch run cov:combine && \
-    hatch run cov:report
-
-
 FROM scratch AS results
 COPY --from=manylinux /dist/cpprb-* /dist/
 CMD [""]

MANIFEST.in

@@ -1 +1,2 @@
-include cpprb/*.hh
+include src/cpprb/*.hh
+exclude test/*

deps.nix

@@ -1,7 +1,7 @@
 #! /usr/bin/env nix
 #! nix --extra-experimental-features ``flakes nix-command`` shell
-#! nix --override-input nixpkgs ``github:NixOS/nixpkgs/release-23.11``
-#! nix --impure --file deps.nix hatch bash
+#! nix -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/branch-off-24.11.tar.gz
+#! nix --impure nixpkgs#actionlint nixpkgs#uv
 #! nix --command bash
 
 echo 'Enter Dev Shell'