From 815879179bcf15387f088c01664423db8c87feda Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 10 Sep 2020 10:12:20 +0200 Subject: [PATCH 1/5] fix build --- .github/workflows/wheel.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml index cc133fc4..f8adf5eb 100644 --- a/.github/workflows/wheel.yaml +++ b/.github/workflows/wheel.yaml @@ -42,7 +42,7 @@ jobs: name: Build source distribution runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v1 - uses: actions/setup-python@v2 name: Install Python @@ -61,10 +61,14 @@ jobs: runs-on: ubuntu-latest if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/v') steps: - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v1 with: name: artifact path: dist + - uses: actions/download-artifact@v1 + with: + name: wheels + path: dist - uses: pypa/gh-action-pypi-publish@master with: From 7aee882e3ba5d36eb7e407aed56cf19353930aae Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 10 Sep 2020 10:13:26 +0200 Subject: [PATCH 2/5] add test run --- .github/workflows/wheel.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml index f8adf5eb..82f6180f 100644 --- a/.github/workflows/wheel.yaml +++ b/.github/workflows/wheel.yaml @@ -56,6 +56,24 @@ jobs: with: path: dist/*.tar.gz + test_dist_pypi: + needs: [build_wheels, build_sdist] + runs-on: ubuntu-latest + steps: + - uses: actions/download-artifact@v1 + with: + name: artifact + path: dist + - uses: actions/download-artifact@v1 + with: + name: wheels + path: dist + + - name: test + run: | + ls + ls dist + upload_pypi: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest From a20789e96f50c91efc089af0cdbf4b946205ee8f Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 10 Sep 2020 13:37:06 +0200 Subject: [PATCH 3/5] fix sdist build --- .github/workflows/ci-osx.yaml | 33 --------------------------------- .github/workflows/wheel.yaml | 2 ++ 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 .github/workflows/ci-osx.yaml diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml deleted file mode 100644 index 545d5412..00000000 --- a/.github/workflows/ci-osx.yaml +++ /dev/null @@ -1,33 +0,0 @@ -name: OSX CI - -on: [push, pull_request] - -jobs: - build: - runs-on: macos-latest - strategy: - fail-fast: false - matrix: - python-version: ["3.5", "3.6", "3.7", "3.8"] - - steps: - - name: Checkout source - uses: actions/checkout@v2 - with: - submodules: recursive - - - name: Set up Python - uses: actions/setup-python@v1 - with: - python-version: ${{ matrix.python-version }} - - - name: Install numcodecs - run: | - python -m pip install -U pip setuptools wheel pytest - python -m pip install -v -e . - - - name: List installed packages - run: python -m pip list - - - name: Run tests - run: pytest -v --pyargs numcodecs \ No newline at end of file diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml index 82f6180f..1c6ee967 100644 --- a/.github/workflows/wheel.yaml +++ b/.github/workflows/wheel.yaml @@ -43,6 +43,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 + with: + submodules: true - uses: actions/setup-python@v2 name: Install Python From e4a07d19fa69a2bbfd85e5b14ded2c55dfcda3a1 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 10 Sep 2020 13:39:56 +0200 Subject: [PATCH 4/5] test sdist install --- .github/workflows/wheel.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/wheel.yaml b/.github/workflows/wheel.yaml index 1c6ee967..123258e5 100644 --- a/.github/workflows/wheel.yaml +++ b/.github/workflows/wheel.yaml @@ -54,6 +54,9 @@ jobs: - name: Build sdist run: python setup.py sdist + - name: test install + run: pip install dist/numcodecs*.tar.gz + - uses: actions/upload-artifact@v2 with: path: dist/*.tar.gz From 980f94ba56a0e88b8f51f0b74613a9697dca7b75 Mon Sep 17 00:00:00 2001 From: Grzegorz Bokota Date: Thu, 10 Sep 2020 16:06:51 +0200 Subject: [PATCH 5/5] restore ci-osx --- .github/workflows/ci-osx.yaml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/ci-osx.yaml diff --git a/.github/workflows/ci-osx.yaml b/.github/workflows/ci-osx.yaml new file mode 100644 index 00000000..d72f8643 --- /dev/null +++ b/.github/workflows/ci-osx.yaml @@ -0,0 +1,33 @@ +name: OSX CI + +on: [push, pull_request] + +jobs: + build: + runs-on: macos-latest + strategy: + fail-fast: false + matrix: + python-version: ["3.5", "3.6", "3.7", "3.8"] + + steps: + - name: Checkout source + uses: actions/checkout@v2 + with: + submodules: recursive + + - name: Set up Python + uses: actions/setup-python@v1 + with: + python-version: ${{ matrix.python-version }} + + - name: Install numcodecs + run: | + python -m pip install -U pip setuptools wheel pytest + python -m pip install -v -e . + + - name: List installed packages + run: python -m pip list + + - name: Run tests + run: pytest -v --pyargs numcodecs \ No newline at end of file