From d026fe419515db59cd7e5c61aeb906bcd82f489f Mon Sep 17 00:00:00 2001 From: Yi-Xuan Xu Date: Fri, 12 Feb 2021 22:25:33 +0800 Subject: [PATCH 01/10] Update build-wheels.yml --- .github/workflows/build-wheels.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 3dc9674..7711768 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 @@ -20,13 +20,10 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.8.0 - name: Build wheels - run: python -m cibuildwheel --output-dir wheelhouse - env: - CIBW_BUILD: "cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp36-win_amd64 cp37-win_amd64 cp38-win_amd64" - - name: Store artifacts - uses: actions/upload-artifact@v2 + uses: joerick/cibuildwheel@v1.9.0 with: - path: ./wheelhouse/*.whl + output-dir: wheelhouse + env: + CIBW_TEST_REQUIRES: pytest, pytest-cov + CIBW_TEST_COMMAND: pytest {package}/tests From df6825659aa97b71c86e67a55e8a2fcfd52afec4 Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 22:36:27 +0800 Subject: [PATCH 02/10] correct version --- .github/workflows/build-wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 7711768..589506e 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -25,5 +25,7 @@ jobs: with: output-dir: wheelhouse env: + CIBW_BUILD: cp3.6-* cp3.7-* cp3.8-* + CIBW_SKIP: "*-win32 *-manylinux_i686 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x" CIBW_TEST_REQUIRES: pytest, pytest-cov CIBW_TEST_COMMAND: pytest {package}/tests From d876be5f6955217610a830ca223412975b6dc12e Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 22:41:25 +0800 Subject: [PATCH 03/10] Update build-wheels.yml --- .github/workflows/build-wheels.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 589506e..e6d722a 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -25,7 +25,7 @@ jobs: with: output-dir: wheelhouse env: - CIBW_BUILD: cp3.6-* cp3.7-* cp3.8-* - CIBW_SKIP: "*-win32 *-manylinux_i686 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x" + CIBW_BUILD: "cp3.6-* cp3.7-* cp3.8-*" + CIBW_SKIP: "*-win32 *-manylinux_i686 *-manylinux_aarch64 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x" CIBW_TEST_REQUIRES: pytest, pytest-cov CIBW_TEST_COMMAND: pytest {package}/tests From 6dcbfec50d4e900b26465d22f8db7b6a72cbe0d9 Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 22:44:33 +0800 Subject: [PATCH 04/10] Update build-wheels.yml --- .github/workflows/build-wheels.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index e6d722a..36fc652 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -25,7 +25,4 @@ jobs: with: output-dir: wheelhouse env: - CIBW_BUILD: "cp3.6-* cp3.7-* cp3.8-*" - CIBW_SKIP: "*-win32 *-manylinux_i686 *-manylinux_aarch64 *-manylinux_aarch64 *-manylinux_ppc64le *-manylinux_s390x" - CIBW_TEST_REQUIRES: pytest, pytest-cov - CIBW_TEST_COMMAND: pytest {package}/tests + CIBW_BUILD: "cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp36-macosx_x86_64 cp37-macosx_x86_64 cp38-macosx_x86_64" From af19cbfd9f35de781e1b39910a925a13a4f3153f Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 22:53:30 +0800 Subject: [PATCH 05/10] Update build-wheels.yml --- .github/workflows/build-wheels.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 36fc652..f60f191 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -26,3 +26,7 @@ jobs: output-dir: wheelhouse env: CIBW_BUILD: "cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp36-macosx_x86_64 cp37-macosx_x86_64 cp38-macosx_x86_64" + - name: Store artifacts + uses: actions/upload-artifact@v2 + with: + path: ./wheelhouse/*.whl From 9156090e22c0447633cca66e5fd3a61cbbb010e3 Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 23:06:05 +0800 Subject: [PATCH 06/10] Update build-wheels.yml --- .github/workflows/build-wheels.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index f60f191..4398b46 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -26,6 +26,8 @@ jobs: output-dir: wheelhouse env: CIBW_BUILD: "cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp36-macosx_x86_64 cp37-macosx_x86_64 cp38-macosx_x86_64" + CIBW_BEFORE_TEST: pip install -r {package}/build_tools/requirements.txt + CIBW_TEST_COMMAND: pytest {package}/tests - name: Store artifacts uses: actions/upload-artifact@v2 with: From 22d17e476c1184ce1eeef2ddbc68224ea52c7d1b Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 23:12:43 +0800 Subject: [PATCH 07/10] update ci --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/build-wheels.yml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index df8e963..307ff06 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest] + os: [ubuntu-latest, windows-latest, macos-latest] python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index 4398b46..f60f191 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -26,8 +26,6 @@ jobs: output-dir: wheelhouse env: CIBW_BUILD: "cp36-manylinux_x86_64 cp37-manylinux_x86_64 cp38-manylinux_x86_64 cp36-win_amd64 cp37-win_amd64 cp38-win_amd64 cp36-macosx_x86_64 cp37-macosx_x86_64 cp38-macosx_x86_64" - CIBW_BEFORE_TEST: pip install -r {package}/build_tools/requirements.txt - CIBW_TEST_COMMAND: pytest {package}/tests - name: Store artifacts uses: actions/upload-artifact@v2 with: From caf7b7d208c2ff7e9db688d322c78e941c323374 Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 23:24:39 +0800 Subject: [PATCH 08/10] add mac-os ci --- .github/workflows/build-and-test.yml | 2 +- .github/workflows/mac-os-build-and-test.yml | 39 +++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/mac-os-build-and-test.yml diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 307ff06..df8e963 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest] python-version: [3.6, 3.7, 3.8] steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/mac-os-build-and-test.yml b/.github/workflows/mac-os-build-and-test.yml new file mode 100644 index 0000000..744ae98 --- /dev/null +++ b/.github/workflows/mac-os-build-and-test.yml @@ -0,0 +1,39 @@ +name: DeepForest-CI + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [macos-latest] + python-version: [3.6, 3.7, 3.8] + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - name: Display python version + run: python -c "import sys; print(sys.version)" + - name: Install OS packages + run: brew install libomp + - name: Install package dependencies + run: | + python -m pip install --upgrade pip + pip install -r build_tools/requirements.txt + - name: Install + run: pip install --verbose --editable . + - name: Run tests + run: | + pytest ./tests --cov-config=.coveragerc --cov-report=xml --cov=deepforest deepforest + - name: Publish code coverage + uses: codecov/codecov-action@v1 + with: + token: ${{ secrets.CODECOV_TOKEN }} + file: ./coverage.xml From c4de555c9f682aeaa5ed47130b5a808778f03b5a Mon Sep 17 00:00:00 2001 From: T-Allen-sudo Date: Fri, 12 Feb 2021 23:42:48 +0800 Subject: [PATCH 09/10] rename ci on mac-os --- .github/workflows/mac-os-build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/mac-os-build-and-test.yml b/.github/workflows/mac-os-build-and-test.yml index 744ae98..3914850 100644 --- a/.github/workflows/mac-os-build-and-test.yml +++ b/.github/workflows/mac-os-build-and-test.yml @@ -1,4 +1,4 @@ -name: DeepForest-CI +name: DeepForest-CI-MacOS on: push: From 47ffec255cd3e58b8775e86b4cc538fc4fdb8e1f Mon Sep 17 00:00:00 2001 From: xuyxu Date: Sat, 13 Feb 2021 00:37:39 +0800 Subject: [PATCH 10/10] update all-contributors --- .all-contributorsrc | 10 ++++++++++ CONTRIBUTORS.md | 1 + 2 files changed, 11 insertions(+) diff --git a/.all-contributorsrc b/.all-contributorsrc index 186e7a7..e9f9412 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -68,6 +68,16 @@ "contributions": [ "bug" ] + }, + { + "login": "T-Allen-sudo", + "name": "T-Allen-sudo", + "avatar_url": "https://avatars.githubusercontent.com/u/65913092?v=4", + "profile": "https://github.com/T-Allen-sudo", + "contributions": [ + "maintenance", + "test" + ] } ], "contributorsPerLine": 7, diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 9f69fda..fb52c53 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -12,6 +12,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Joey Gao
💻
Mr-memorandum
🐛
NiMaZi
💻 ⚠️ +
T-Allen-sudo
🚧 ⚠️
Yi-Xuan Xu
💻 📖 ⚠️
tczhao
💻 📖 ⚠️