Merge pull request #7 from benfred/test_gha

Create wheels with github actions and update rust dependencies

Author: benfred

.github/workflows/create_wheels.yaml

@@ -0,0 +1,97 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ master ]
+    tags:
+      - v*
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build-wheels:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+        python-version: [37, 38, 39, 310, 311]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        if: runner.os == 'Linux'
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: all
+
+      - name: Setup rust
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build wheels
+        uses: pypa/[email protected]
+        env:
+          CIBW_BUILD: cp${{matrix.python-version}}-*
+          CIBW_ENVIRONMENT: 'PATH="$HOME/.cargo/bin:$PATH" CARGO_TERM_COLOR="always"'
+          CIBW_ENVIRONMENT_WINDOWS: 'PATH="$UserProfile\.cargo\bin;$PATH"'
+
+      - name: Upload Binaries
+        uses: actions/upload-artifact@v3
+        with:
+          name: wheels
+          path: wheelhouse
+
+  test-wheels:
+    needs: [build-wheels]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        python-version: [3.7, 3.8, 3.9, '3.10', '3.11']
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        path: py_cpp_demangle_source
+    - uses: actions/download-artifact@v3
+      with:
+        name: wheels
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install wheel
+      run: |
+        pip install --force-reinstall --no-deps --no-index --find-links . cpp-demangle
+    - name: Run unittests
+      run: |
+        python -m unittest discover py_cpp_demangle_source/tests
+
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    if: "startsWith(github.ref, 'refs/tags/')"
+    needs: [test-wheels]
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: wheels
+      - name: Create GitHub Release
+        uses: fnkr/[email protected]
+        env:
+          GHR_PATH: .
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Push to PyPi
+        env:
+          TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        run: |
+          pip install --upgrade wheel pip setuptools twine
+          twine upload *
+          rm *

.travis.yml

@@ -2,15 +2,15 @@
 name = "py_cpp_demangle"
 version = "0.1.0"
 authors = ["Ben Frederickson <[email protected]>"]
-edition = "2018"
+edition = "2021"
 
 [lib]
-name = "py_cpp_demangle"
+name = "cpp_demangle"
 crate-type = ["cdylib"]
 
 [dependencies]
-cpp_demangle = "0.2.12"
+cpp_demangle = "0.4.0"
 
 [dependencies.pyo3]
-version = "0.7"
+version = "0.17.3"
 features = ["extension-module"]

Cargo.toml

@@ -3,5 +3,5 @@ if [ ! -d ~/rust-installer ]; then
     curl -sL https://static.rust-lang.org/rustup.sh -o ~/rust-installer/rustup.sh
     sh ~/rust-installer/rustup.sh -y
     source $HOME/.cargo/env
-    rustup default nightly
+    rustup default stable
 fi

appveyor.yml

@@ -0,0 +1,19 @@
+[tool.cibuildwheel]
+# skip testing in the cibuildwheel phase, will install the wheels later
+# and verify
+test-command = ""
+skip = ["pp*", "*musl*",  "*-manylinux_i686", "*win32"]
+
+[tool.cibuildwheel.macos]
+archs = ["x86_64"]
+
+[build-system]
+requires = [
+    "setuptools>=42",
+    "wheel",
+    "setuptools_rust",
+]
+build-backend = "setuptools.build_meta"
+
+[tool.cibuildwheel.linux]
+before-all = "ci/install_rust.sh"

ci/install_rust.sh

@@ -1,6 +1,8 @@
 use pyo3::prelude::*;
 use pyo3::exceptions;
 
+
+
 // This defines a python module. pyo3 will copy the rust doc comment
 // below into a python docstring
 
@@ -25,14 +27,14 @@ use pyo3::exceptions;
 fn cpp_demangle(_py: Python, m: &PyModule) -> PyResult<()> {
     // This adds a function to the python module:
     /// Demangles a mangled c++ linker symbol name and returns it as a string
-    #[pyfn(m, "demangle")]
+    #[pyfn(m)]
     fn demangle(mangled: String) -> PyResult<String> {
-        match cpp_demangle::Symbol::new(&mangled[..]) {
+        match ::cpp_demangle::Symbol::new(&mangled[..]) {
             // Return the output as a string to Python
             Ok(sym) => Ok(sym.to_string()),
 
             // on an error, this will raise a python ValueError exception!
-            Err(error) => return Err(exceptions::ValueError::py_err(error.to_string()))
+            Err(error) => return Err(exceptions::PyValueError::new_err(error.to_string()))
         }
     }