From 5d59e94cdc7d68a4962ed2a24b63c6ccbac8904b Mon Sep 17 00:00:00 2001 From: jurra Date: Mon, 18 Sep 2023 18:38:09 +0200 Subject: [PATCH] changed wheels configuration and requirements to properly run the tests --- .github/workflows/publish.yml | 35 ----------------------------------- .github/workflows/wheels.yml | 20 +++++++++++--------- pyproject.toml | 3 ++- 3 files changed, 13 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/publish.yml diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 179063f..0000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,35 +0,0 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# GitHub recommends pinning actions to a commit SHA. -# To get a newer version, you will need to update the SHA. -# You can also reference a tag or branch, but the action may change without warning. - -name: Upload Python Package - -on: - release: - types: [published] - -jobs: - deploy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: Set up Python - uses: actions/setup-python@v4 - with: - python-version: '3.x' - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install build - - name: Build package - run: python -m build - - name: Publish package - uses: pypa/gh-action-pypi-publish@v1.6.4 - with: - user: __token__ - password: ${{ secrets.pypi_password }} \ No newline at end of file diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 7ca34ee..988fb35 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -8,13 +8,13 @@ on: pull_request: push: branches: [ '*' ] - # release: - # types: - # - published + release: + types: + - published -# concurrency: -# group: ${{ github.workflow }}-${{ github.ref }} -# cancel-in-progress: true +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true jobs: build_sdist: @@ -40,7 +40,10 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, + # windows-latest, + # macos-latest + ] steps: - uses: actions/checkout@v3 @@ -49,7 +52,6 @@ jobs: env: CIBW_ARCHS_MACOS: auto universal2 CIBW_PRERELEASE_PYTHONS: true - CIBW_TEST_COMMAND: "" - name: Verify clean directory run: git diff --exit-code @@ -71,7 +73,7 @@ jobs: - uses: actions/setup-python@v4 name: Set up Python 3.x with: - python-version: "3.x" + python-version: "3.8" - uses: actions/download-artifact@v3 name: Download wheels diff --git a/pyproject.toml b/pyproject.toml index a8518ed..df98844 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,7 +7,8 @@ requires = [ build-backend = "setuptools.build_meta" [tool.cibuildwheel] -test-command = "python {project}/tests/test.py" +# test-requires = [ "pytest"] +# test-command = "pytest" test-skip = "*universal2:arm64" [tool.ruff]