From 6960be8b011148ecaa7faf9d5268565f63c229ab Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:11:35 -0700 Subject: [PATCH 01/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 345c7f2..e70ec62 100644 --- a/setup.py +++ b/setup.py @@ -312,7 +312,7 @@ def run(self): setup( name='yara-python-dex', - version='1.0.0', + version='1.0.1', description='Python interface for YARA', long_description=readme, license='Apache 2.0', From d46c18858a6f8e9c3f20864c7162909626050354 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:18:03 -0700 Subject: [PATCH 02/13] Create test-arm.yml --- .github/workflows/test-arm.yml | 35 ++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .github/workflows/test-arm.yml diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml new file mode 100644 index 0000000..f0c392a --- /dev/null +++ b/.github/workflows/test-arm.yml @@ -0,0 +1,35 @@ +name: Test arm + +on: [push, pull_request] + +jobs: + build: + name: Build wheels on ${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macOS-latest] + + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-python@v2 + name: Install Python + + - name: Install cibuildwheel + run: python -m pip install cibuildwheel==1.7.4 + + - name: Build wheels for Windows + if: startsWith(matrix.os, 'windows') + run: | + git submodule update --init --recursive + python -m cibuildwheel --output-dir wheels + env: + CIBW_SKIP: "cp27-* pp27-*" # skip Python 2.7 wheels + + - name: Build wheels for mac and manylinux + if: "!startsWith(matrix.os, 'windows')" + run: | + git submodule update --init --recursive + python -m cibuildwheel --output-dir wheels + ls wheels From 04063d019887b986d769172b86dacbfedfdf5a7c Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:23:44 -0700 Subject: [PATCH 03/13] Update test-arm.yml --- .github/workflows/test-arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml index f0c392a..6c40d6e 100644 --- a/.github/workflows/test-arm.yml +++ b/.github/workflows/test-arm.yml @@ -17,7 +17,7 @@ jobs: name: Install Python - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.7.4 + run: python -m pip install cibuildwheel==1.11.0 - name: Build wheels for Windows if: startsWith(matrix.os, 'windows') From f4cefe7d893eaba05b557e77f5d02138e8728ee1 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:38:12 -0700 Subject: [PATCH 04/13] Update test-arm.yml --- .github/workflows/test-arm.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml index 6c40d6e..e0a14a4 100644 --- a/.github/workflows/test-arm.yml +++ b/.github/workflows/test-arm.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [macOS-latest] steps: - uses: actions/checkout@v2 @@ -33,3 +33,5 @@ jobs: git submodule update --init --recursive python -m cibuildwheel --output-dir wheels ls wheels + env: + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" From 26bc853d00879f26ac7db33650e27c932c200026 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:51:53 -0700 Subject: [PATCH 05/13] Generate ARM on Mac --- .github/workflows/build_publish.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml index 67725b6..5c2b735 100644 --- a/.github/workflows/build_publish.yml +++ b/.github/workflows/build_publish.yml @@ -19,7 +19,7 @@ jobs: name: Install Python - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.7.4 + run: python -m pip install cibuildwheel==1.11.0 - name: Build wheels for Windows if: startsWith(matrix.os, 'windows') @@ -34,6 +34,8 @@ jobs: run: | git submodule update --init --recursive python -m cibuildwheel --output-dir wheels + env: + CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - uses: actions/upload-artifact@v2 name: Upload wheels From 5cabf48822264d53123cc72406fae518be5aba2a Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:53:07 -0700 Subject: [PATCH 06/13] Update test-arm.yml --- .github/workflows/test-arm.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml index e0a14a4..ee9cb1d 100644 --- a/.github/workflows/test-arm.yml +++ b/.github/workflows/test-arm.yml @@ -2,13 +2,13 @@ name: Test arm on: [push, pull_request] -jobs: +obs: build: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} strategy: matrix: - os: [macOS-latest] + os: [ubuntu-latest, windows-latest, macOS-latest] steps: - uses: actions/checkout@v2 @@ -35,3 +35,10 @@ jobs: ls wheels env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + CIBW_ARCHS_LINUX: "auto aarch64" + + - uses: actions/upload-artifact@v2 + name: Upload wheels + with: + name: wheels + path: ./wheels/*.whl From d1fe16f4731e885e63240092bbb69f752a47f2af Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:54:24 -0700 Subject: [PATCH 07/13] Update test-arm.yml --- .github/workflows/test-arm.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml index ee9cb1d..809ca55 100644 --- a/.github/workflows/test-arm.yml +++ b/.github/workflows/test-arm.yml @@ -2,7 +2,7 @@ name: Test arm on: [push, pull_request] -obs: +jobs: build: name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} From c2660665c5306e3d11413c2505dc74745aef204a Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 12:56:05 -0700 Subject: [PATCH 08/13] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index e70ec62..345c7f2 100644 --- a/setup.py +++ b/setup.py @@ -312,7 +312,7 @@ def run(self): setup( name='yara-python-dex', - version='1.0.1', + version='1.0.0', description='Python interface for YARA', long_description=readme, license='Apache 2.0', From dbc8a2e5c006ee9f92dda459112d29c6c28c91a7 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 13:21:06 -0700 Subject: [PATCH 09/13] Update build_publish.yml --- .github/workflows/build_publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml index 5c2b735..64cd677 100644 --- a/.github/workflows/build_publish.yml +++ b/.github/workflows/build_publish.yml @@ -36,6 +36,7 @@ jobs: python -m cibuildwheel --output-dir wheels env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" + CIBW_ARCHS_LINUX: "auto aarch64" - uses: actions/upload-artifact@v2 name: Upload wheels From a730dd38a1ffdb840f6c9ed467bba34237ebb656 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 13:49:03 -0700 Subject: [PATCH 10/13] Update build_publish.yml --- .github/workflows/build_publish.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_publish.yml b/.github/workflows/build_publish.yml index 64cd677..5c2b735 100644 --- a/.github/workflows/build_publish.yml +++ b/.github/workflows/build_publish.yml @@ -36,7 +36,6 @@ jobs: python -m cibuildwheel --output-dir wheels env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - CIBW_ARCHS_LINUX: "auto aarch64" - uses: actions/upload-artifact@v2 name: Upload wheels From 6231eb6ea1c88ecfafdf6cdf33d7074e7db20c10 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 13:49:22 -0700 Subject: [PATCH 11/13] Update test-arm.yml --- .github/workflows/test-arm.yml | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml index 809ca55..1e484eb 100644 --- a/.github/workflows/test-arm.yml +++ b/.github/workflows/test-arm.yml @@ -32,13 +32,36 @@ jobs: run: | git submodule update --init --recursive python -m cibuildwheel --output-dir wheels - ls wheels env: CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - CIBW_ARCHS_LINUX: "auto aarch64" - uses: actions/upload-artifact@v2 name: Upload wheels with: name: wheels path: ./wheels/*.whl + + publish: + needs: build + name: Publish to PyPI + runs-on: ubuntu-latest + + steps: + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: '3.x' + - name: Install twine + run: | + python -m pip install --upgrade pip + pip install twine + - name: Download Artifacts + uses: actions/download-artifact@v2 + with: + name: wheels + path: ./wheels + - name: Publish + env: + TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} + run: twine upload ./wheels/* From 56da82ca51980637094896065a3c987a29d89ff7 Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 14:04:47 -0700 Subject: [PATCH 12/13] Version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 345c7f2..e70ec62 100644 --- a/setup.py +++ b/setup.py @@ -312,7 +312,7 @@ def run(self): setup( name='yara-python-dex', - version='1.0.0', + version='1.0.1', description='Python interface for YARA', long_description=readme, license='Apache 2.0', From a05e95f8516720659ed7ec5e69f49561131cc3fa Mon Sep 17 00:00:00 2001 From: Ajin Abraham Date: Sat, 22 May 2021 14:04:58 -0700 Subject: [PATCH 13/13] Delete test-arm.yml --- .github/workflows/test-arm.yml | 67 ---------------------------------- 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/test-arm.yml diff --git a/.github/workflows/test-arm.yml b/.github/workflows/test-arm.yml deleted file mode 100644 index 1e484eb..0000000 --- a/.github/workflows/test-arm.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Test arm - -on: [push, pull_request] - -jobs: - build: - name: Build wheels on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] - - steps: - - uses: actions/checkout@v2 - - - uses: actions/setup-python@v2 - name: Install Python - - - name: Install cibuildwheel - run: python -m pip install cibuildwheel==1.11.0 - - - name: Build wheels for Windows - if: startsWith(matrix.os, 'windows') - run: | - git submodule update --init --recursive - python -m cibuildwheel --output-dir wheels - env: - CIBW_SKIP: "cp27-* pp27-*" # skip Python 2.7 wheels - - - name: Build wheels for mac and manylinux - if: "!startsWith(matrix.os, 'windows')" - run: | - git submodule update --init --recursive - python -m cibuildwheel --output-dir wheels - env: - CIBW_ARCHS_MACOS: "x86_64 universal2 arm64" - - - uses: actions/upload-artifact@v2 - name: Upload wheels - with: - name: wheels - path: ./wheels/*.whl - - publish: - needs: build - name: Publish to PyPI - runs-on: ubuntu-latest - - steps: - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: '3.x' - - name: Install twine - run: | - python -m pip install --upgrade pip - pip install twine - - name: Download Artifacts - uses: actions/download-artifact@v2 - with: - name: wheels - path: ./wheels - - name: Publish - env: - TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }} - TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }} - run: twine upload ./wheels/*