From b3ef5fc4528d807e153d3f1c2bed304dbb7f286b Mon Sep 17 00:00:00 2001 From: Christiam Camacho Date: Wed, 24 Jul 2024 12:12:32 -0400 Subject: [PATCH 1/4] Add wheel module installation; update python versions --- .github/workflows/build-multi-pex.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multi-pex.yml b/.github/workflows/build-multi-pex.yml index 656e445..261d3f0 100644 --- a/.github/workflows/build-multi-pex.yml +++ b/.github/workflows/build-multi-pex.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8"] + python-version: ["3.9"] steps: - name: Checkout @@ -21,6 +21,7 @@ jobs: - name: Build PEX file run: | pip3 install -r requirements/test.txt + pip3 install wheel pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast ./elastic-blast --version ls -l elastic-blast @@ -38,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10"] + python-version: ["3.9", "3.10", "3.11"] steps: @@ -53,6 +54,7 @@ jobs: - name: Build PEX file run: | pip3 install -r requirements/test.txt + pip3 install wheel pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast${{ matrix.python-version }} ./elastic-blast${{ matrix.python-version }} --version ls -l ./elastic-blast${{ matrix.python-version }} From f0b74ae1348e5e08e22dcac883b64c58f3fad0b1 Mon Sep 17 00:00:00 2001 From: Christiam Camacho Date: Wed, 24 Jul 2024 13:10:41 -0400 Subject: [PATCH 2/4] Revert order of installation of packages --- .github/workflows/build-multi-pex.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multi-pex.yml b/.github/workflows/build-multi-pex.yml index 261d3f0..716cfb8 100644 --- a/.github/workflows/build-multi-pex.yml +++ b/.github/workflows/build-multi-pex.yml @@ -20,8 +20,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Build PEX file run: | - pip3 install -r requirements/test.txt pip3 install wheel + pip3 install -r requirements/test.txt pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast ./elastic-blast --version ls -l elastic-blast @@ -53,8 +53,8 @@ jobs: python-version: ${{ matrix.python-version }} - name: Build PEX file run: | - pip3 install -r requirements/test.txt pip3 install wheel + pip3 install -r requirements/test.txt pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast${{ matrix.python-version }} ./elastic-blast${{ matrix.python-version }} --version ls -l ./elastic-blast${{ matrix.python-version }} From 4ca8a2a293c8c3f5d03f21c7f9239189f963a36c Mon Sep 17 00:00:00 2001 From: Christiam Camacho Date: Wed, 24 Jul 2024 14:45:24 -0400 Subject: [PATCH 3/4] Try installing glob2 --- .github/workflows/build-multi-pex.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multi-pex.yml b/.github/workflows/build-multi-pex.yml index 716cfb8..ccd3195 100644 --- a/.github/workflows/build-multi-pex.yml +++ b/.github/workflows/build-multi-pex.yml @@ -20,7 +20,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Build PEX file run: | - pip3 install wheel + pip3 install wheel glob2 pip3 install -r requirements/test.txt pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast ./elastic-blast --version @@ -53,7 +53,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Build PEX file run: | - pip3 install wheel + pip3 install wheel glob2 pip3 install -r requirements/test.txt pex --python-shebang='/usr/bin/env python3' --disable-cache . -r requirements/base.txt --python=python${{ matrix.python-version }} -c elastic-blast -o elastic-blast${{ matrix.python-version }} ./elastic-blast${{ matrix.python-version }} --version From db25c14490a926d7c94516d30929034f39d0bdfe Mon Sep 17 00:00:00 2001 From: Christiam Camacho Date: Wed, 24 Jul 2024 14:48:23 -0400 Subject: [PATCH 4/4] Fix building archive --- .github/workflows/build-multi-pex.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-multi-pex.yml b/.github/workflows/build-multi-pex.yml index ccd3195..783604a 100644 --- a/.github/workflows/build-multi-pex.yml +++ b/.github/workflows/build-multi-pex.yml @@ -80,9 +80,9 @@ jobs: - name: Create tarball run: | tar axvf elastic-blast-no-suffix/elastic-blast-no-suffix.tar.gz - tar axvf elastic-blast-3.8/elastic-blast3.8.tar.gz tar axvf elastic-blast-3.9/elastic-blast3.9.tar.gz tar axvf elastic-blast-3.10/elastic-blast3.10.tar.gz + tar axvf elastic-blast-3.11/elastic-blast3.11.tar.gz rm -fvr elastic-blast-*.tar.gz tar -czvf ~/elastic-blast.tar.gz elastic-blast elastic-blast*md5 elastic-blast3.* - name: 'Upload Artifact'