From 229907ccbd6af5838f90b5e2df0e54c85cc25959 Mon Sep 17 00:00:00 2001 From: Gabe Fierro Date: Sun, 6 Nov 2022 23:48:22 -0700 Subject: [PATCH] try libclang env var --- .github/workflows/publish2.yml | 470 +++++++++++++++++---------------- Cargo.toml | 2 +- pyproject.toml | 2 +- 3 files changed, 240 insertions(+), 234 deletions(-) diff --git a/.github/workflows/publish2.yml b/.github/workflows/publish2.yml index a952c58..38a6f72 100644 --- a/.github/workflows/publish2.yml +++ b/.github/workflows/publish2.yml @@ -24,6 +24,9 @@ jobs: uses: KyleMayes/install-llvm-action@v1 with: version: "10.0" + - name: llvm path setup + run: | + export LIBCLANG_PATH=${LLVM_PATH} - name: Build wheels - x86_64 uses: messense/maturin-action@v1 with: @@ -52,242 +55,245 @@ jobs: matrix: target: [x86_64, i686] steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 - with: - python-version: 3.9 - architecture: x64 - - name: Install LLVM and Clang - uses: KyleMayes/install-llvm-action@v1 - with: - version: "10.0" - - name: Symlink libclang.so (Linux) - if: contains(matrix.os, 'ubuntu') - run: sudo ln -s libclang-10.so.1 /lib/x86_64-linux-gnu/libclang.so - working-directory: ${{ env.LLVM_PATH }}/lib - - name: Build wheels - uses: messense/maturin-action@v1 - with: - target: ${{ matrix.target }} - manylinux: auto - args: --release --out dist -m Cargo.toml -F python - - name: Install built wheel - if: matrix.target == 'x86_64' - run: | - pip install reasonable --no-index --find-links dist --force-reinstall - python -c "import reasonable" - - name: Upload wheels - uses: actions/upload-artifact@v2 - with: - name: wheels - path: dist + - uses: actions/checkout@v2 + - uses: actions/setup-python@v2 + with: + python-version: 3.9 + architecture: x64 + - name: Install LLVM and Clang + uses: KyleMayes/install-llvm-action@v1 + with: + version: "10.0" + - name: Symlink libclang.so (Linux) + if: contains(matrix.os, 'ubuntu') + run: sudo ln -s libclang-10.so.1 /lib/x86_64-linux-gnu/libclang.so + working-directory: ${{ env.LLVM_PATH }}/lib + - name: llvm path setup + run: | + export LIBCLANG_PATH=${LLVM_PATH} + - name: Build wheels + uses: messense/maturin-action@v1 + with: + target: ${{ matrix.target }} + manylinux: auto + args: --release --out dist -m Cargo.toml -F python + - name: Install built wheel + if: matrix.target == 'x86_64' + run: | + pip install reasonable --no-index --find-links dist --force-reinstall + python -c "import reasonable" + - name: Upload wheels + uses: actions/upload-artifact@v2 + with: + name: wheels + path: dist - #windows: - # runs-on: windows-latest - # strategy: - # matrix: - # target: [x64, x86] - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # architecture: ${{ matrix.target }} - # - name: Install Rust toolchain - # uses: actions-rs/toolchain@v1 - # with: - # toolchain: nightly - # profile: minimal - # default: true - # - name: Build wheels - # uses: messense/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # args: --release --out dist -m Cargo.toml -F python - # - name: Install built wheel - # run: | - # pip install reasonable --no-index --find-links dist --force-reinstall - # python -c "import reasonable" - # - name: Upload wheels - # uses: actions/upload-artifact@v2 - # with: - # name: wheels - # path: dist + #windows: + # runs-on: windows-latest + # strategy: + # matrix: + # target: [x64, x86] + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # architecture: ${{ matrix.target }} + # - name: Install Rust toolchain + # uses: actions-rs/toolchain@v1 + # with: + # toolchain: nightly + # profile: minimal + # default: true + # - name: Build wheels + # uses: messense/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # args: --release --out dist -m Cargo.toml -F python + # - name: Install built wheel + # run: | + # pip install reasonable --no-index --find-links dist --force-reinstall + # python -c "import reasonable" + # - name: Upload wheels + # uses: actions/upload-artifact@v2 + # with: + # name: wheels + # path: dist - #linux: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # target: [x86_64, i686] - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # architecture: x64 - # - name: install toolchains - # run: | - # yum -y install centos-release-scl-rh - # yum -y install llvm-toolset-7.0 - # source scl_source enable llvm-toolset-7.0 - # - name: Build wheels - # uses: messense/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # manylinux: auto - # args: --release --out dist -m Cargo.toml -F python - # - name: Install built wheel - # if: matrix.target == 'x86_64' - # run: | - # pip install reasonable --no-index --find-links dist --force-reinstall - # python -c "import reasonable" - # - name: Upload wheels - # uses: actions/upload-artifact@v2 - # with: - # name: wheels - # path: dist + #linux: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # target: [x86_64, i686] + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # architecture: x64 + # - name: install toolchains + # run: | + # yum -y install centos-release-scl-rh + # yum -y install llvm-toolset-7.0 + # source scl_source enable llvm-toolset-7.0 + # - name: Build wheels + # uses: messense/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # manylinux: auto + # args: --release --out dist -m Cargo.toml -F python + # - name: Install built wheel + # if: matrix.target == 'x86_64' + # run: | + # pip install reasonable --no-index --find-links dist --force-reinstall + # python -c "import reasonable" + # - name: Upload wheels + # uses: actions/upload-artifact@v2 + # with: + # name: wheels + # path: dist - #linux-cross: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # target: [aarch64, armv7] - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # - name: install toolchains - # run: | - # yum -y install centos-release-scl-rh - # yum -y install llvm-toolset-7.0 - # source scl_source enable llvm-toolset-7.0 - # - name: Build wheels - # uses: messense/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # manylinux: auto - # args: --release --out dist -m Cargo.toml -F python - # - uses: uraimo/run-on-arch-action@v2.0.5 - # if: matrix.target != 'ppc64' - # name: Install built wheel - # with: - # arch: ${{ matrix.target }} - # distro: ubuntu20.04 - # githubToken: ${{ github.token }} - # install: | - # apt-get update - # apt-get install -y --no-install-recommends python3 python3-pip - # pip3 install -U pip - # run: | - # pip3 install reasonable --no-index --find-links dist/ --force-reinstall - # python3 -c "import reasonable" - # - name: Upload wheels - # uses: actions/upload-artifact@v2 - # with: - # name: wheels - # path: dist + #linux-cross: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # target: [aarch64, armv7] + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # - name: install toolchains + # run: | + # yum -y install centos-release-scl-rh + # yum -y install llvm-toolset-7.0 + # source scl_source enable llvm-toolset-7.0 + # - name: Build wheels + # uses: messense/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # manylinux: auto + # args: --release --out dist -m Cargo.toml -F python + # - uses: uraimo/run-on-arch-action@v2.0.5 + # if: matrix.target != 'ppc64' + # name: Install built wheel + # with: + # arch: ${{ matrix.target }} + # distro: ubuntu20.04 + # githubToken: ${{ github.token }} + # install: | + # apt-get update + # apt-get install -y --no-install-recommends python3 python3-pip + # pip3 install -U pip + # run: | + # pip3 install reasonable --no-index --find-links dist/ --force-reinstall + # python3 -c "import reasonable" + # - name: Upload wheels + # uses: actions/upload-artifact@v2 + # with: + # name: wheels + # path: dist - #musllinux: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # target: - # - x86_64-unknown-linux-musl - # - i686-unknown-linux-musl - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # architecture: x64 - # - name: install toolchains - # run: | - # yum -y install centos-release-scl-rh - # yum -y install llvm-toolset-7.0 - # source scl_source enable llvm-toolset-7.0 - # - name: Build wheels - # uses: messense/maturin-action@v1 - # with: - # target: ${{ matrix.target }} - # manylinux: musllinux_1_2 - # args: --release --out dist -m Cargo.toml -F python - # - name: Install built wheel - # if: matrix.target == 'x86_64-unknown-linux-musl' - # uses: addnab/docker-run-action@v3 - # with: - # image: alpine:latest - # options: -v ${{ github.workspace }}:/io -w /io - # run: | - # apk add py3-pip - # pip3 install -U pip - # pip3 install reasonable --no-index --find-links /io/dist/ --force-reinstall - # python3 -c "import reasonable" - # - name: Upload wheels - # uses: actions/upload-artifact@v2 - # with: - # name: wheels - # path: dist + #musllinux: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # target: + # - x86_64-unknown-linux-musl + # - i686-unknown-linux-musl + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # architecture: x64 + # - name: install toolchains + # run: | + # yum -y install centos-release-scl-rh + # yum -y install llvm-toolset-7.0 + # source scl_source enable llvm-toolset-7.0 + # - name: Build wheels + # uses: messense/maturin-action@v1 + # with: + # target: ${{ matrix.target }} + # manylinux: musllinux_1_2 + # args: --release --out dist -m Cargo.toml -F python + # - name: Install built wheel + # if: matrix.target == 'x86_64-unknown-linux-musl' + # uses: addnab/docker-run-action@v3 + # with: + # image: alpine:latest + # options: -v ${{ github.workspace }}:/io -w /io + # run: | + # apk add py3-pip + # pip3 install -U pip + # pip3 install reasonable --no-index --find-links /io/dist/ --force-reinstall + # python3 -c "import reasonable" + # - name: Upload wheels + # uses: actions/upload-artifact@v2 + # with: + # name: wheels + # path: dist - #musllinux-cross: - # runs-on: ubuntu-latest - # strategy: - # matrix: - # platform: - # - target: aarch64-unknown-linux-musl - # arch: aarch64 - # - target: armv7-unknown-linux-musleabihf - # arch: armv7 - # steps: - # - uses: actions/checkout@v2 - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # - name: install toolchains - # run: | - # yum -y install centos-release-scl-rh - # yum -y install llvm-toolset-7.0 - # source scl_source enable llvm-toolset-7.0 - # - name: Build wheels - # uses: messense/maturin-action@v1 - # with: - # target: ${{ matrix.platform.target }} - # manylinux: musllinux_1_2 - # args: --release --out dist -m Cargo.toml -F python - # - uses: uraimo/run-on-arch-action@master - # name: Install built wheel - # with: - # arch: ${{ matrix.platform.arch }} - # distro: alpine_latest - # githubToken: ${{ github.token }} - # install: | - # apk add py3-pip - # pip3 install -U pip - # run: | - # pip3 install reasonable --no-index --find-links dist/ --force-reinstall - # python3 -c "import reasonable" - # - name: Upload wheels - # uses: actions/upload-artifact@v2 - # with: - # name: wheels - # path: dist + #musllinux-cross: + # runs-on: ubuntu-latest + # strategy: + # matrix: + # platform: + # - target: aarch64-unknown-linux-musl + # arch: aarch64 + # - target: armv7-unknown-linux-musleabihf + # arch: armv7 + # steps: + # - uses: actions/checkout@v2 + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # - name: install toolchains + # run: | + # yum -y install centos-release-scl-rh + # yum -y install llvm-toolset-7.0 + # source scl_source enable llvm-toolset-7.0 + # - name: Build wheels + # uses: messense/maturin-action@v1 + # with: + # target: ${{ matrix.platform.target }} + # manylinux: musllinux_1_2 + # args: --release --out dist -m Cargo.toml -F python + # - uses: uraimo/run-on-arch-action@master + # name: Install built wheel + # with: + # arch: ${{ matrix.platform.arch }} + # distro: alpine_latest + # githubToken: ${{ github.token }} + # install: | + # apk add py3-pip + # pip3 install -U pip + # run: | + # pip3 install reasonable --no-index --find-links dist/ --force-reinstall + # python3 -c "import reasonable" + # - name: Upload wheels + # uses: actions/upload-artifact@v2 + # with: + # name: wheels + # path: dist - #release: - # name: Release - # runs-on: ubuntu-latest - # needs: [ macos, windows, linux, linux-cross, musllinux, musllinux-cross ] - # steps: - # - uses: actions/download-artifact@v2 - # with: - # name: wheels - # - uses: actions/setup-python@v2 - # with: - # python-version: 3.9 - # - name: Publish to PyPi - # env: - # TWINE_USERNAME: __token__ - # TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - # run: | - # pip install --upgrade twine - # twine upload --skip-existing * + #release: + # name: Release + # runs-on: ubuntu-latest + # needs: [ macos, windows, linux, linux-cross, musllinux, musllinux-cross ] + # steps: + # - uses: actions/download-artifact@v2 + # with: + # name: wheels + # - uses: actions/setup-python@v2 + # with: + # python-version: 3.9 + # - name: Publish to PyPi + # env: + # TWINE_USERNAME: __token__ + # TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + # run: | + # pip install --upgrade twine + # twine upload --skip-existing * diff --git a/Cargo.toml b/Cargo.toml index 89d6444..9e63b34 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reasonable" -version = "0.2.1-alpha8" +version = "0.2.1-alpha9" authors = ["Gabe Fierro "] repository = "https://github.com/gtfierro/reasonable" homepage = "https://brickschema.org/" diff --git a/pyproject.toml b/pyproject.toml index c84d090..80d69fe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "reasonable" -version = "0.2.1-a8" +version = "0.2.1-a9" description = "Python interface to 'reasonable', a Datalog implementation of the OWL 2 RL profile" authors = ["Gabe Fierro "] license = "bsd-3-clause"