From 8c588f738b010335f525430cc963bdf12ba22b76 Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:28:03 +0200 Subject: [PATCH 1/7] CI: Make release distribution --- .github/workflows/release.yml | 25 +++++++++++++++++++++++++ pyproject.toml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..f67a201 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,25 @@ +name: "Make drakpdb distribution" +on: + push: + branches: + - master + pull_request: + branches: + - master + +jobs: + release_pypi: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-python@v5 + - name: Build source distribution + run: python3 setup.py sdist + - name: Build wheel distribution + run: + pip install cibuildwheel==2.19.2 + python -m cibuildwheel --output-dir dist --archs x86_64 --platform linux + - uses: actions/upload-artifact@v4 + with: + name: cibw-wheels + path: ./dist/* diff --git a/pyproject.toml b/pyproject.toml index 537644f..270bfb2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,7 +24,7 @@ dependencies = [ drakpdb = "drakpdb.main:main" [tool.setuptools] -packages = ["drakpdb", "drakpdb.pdbparse"] +packages = ["drakpdb", "drakpdb.pdbparse", "drakpdb.pdbparse._undname"] [tool.black] exclude = "drakpdb/pdbparse/*" From 75b053dc3a06104def603d46ff5c3bc3156a95e1 Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:28:54 +0200 Subject: [PATCH 2/7] Oopsie --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f67a201..dbbca02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: - name: Build source distribution run: python3 setup.py sdist - name: Build wheel distribution - run: + run: | pip install cibuildwheel==2.19.2 python -m cibuildwheel --output-dir dist --archs x86_64 --platform linux - uses: actions/upload-artifact@v4 From 5e701d91048fc56b840981cc4cdb01d995900a8b Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:33:52 +0200 Subject: [PATCH 3/7] Add python version to setup --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dbbca02..00bfbe3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 + with: + python-version: 3.8 - name: Build source distribution run: python3 setup.py sdist - name: Build wheel distribution From 248fd259e3a2e08a9f7d277c54f7b71230b414eb Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:39:20 +0200 Subject: [PATCH 4/7] Upgrade setuptools --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 00bfbe3..bd4149b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,9 @@ jobs: with: python-version: 3.8 - name: Build source distribution - run: python3 setup.py sdist + run: | + pip install -U setuptools + python3 setup.py sdist - name: Build wheel distribution run: | pip install cibuildwheel==2.19.2 From fb0a93d508b39a6d50231484584f37f5cc99a314 Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:41:36 +0200 Subject: [PATCH 5/7] Require non-EOL Python --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 270bfb2..5c42686 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,6 +19,7 @@ dependencies = [ "requests>2.32.2", "tqdm", ] +requires-python = ">=3.8" [project.scripts] drakpdb = "drakpdb.main:main" From 271a85b6e0787634d3ee13db11322df2db0169d1 Mon Sep 17 00:00:00 2001 From: psrok1 Date: Wed, 31 Jul 2024 17:46:25 +0200 Subject: [PATCH 6/7] Rename artifact and workflow --- .github/workflows/{release.yml => build.yml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{release.yml => build.yml} (87%) diff --git a/.github/workflows/release.yml b/.github/workflows/build.yml similarity index 87% rename from .github/workflows/release.yml rename to .github/workflows/build.yml index bd4149b..833860a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: "Make drakpdb distribution" +name: "Build drakpdb distribution packages" on: push: branches: @@ -8,7 +8,7 @@ on: - master jobs: - release_pypi: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -25,5 +25,5 @@ jobs: python -m cibuildwheel --output-dir dist --archs x86_64 --platform linux - uses: actions/upload-artifact@v4 with: - name: cibw-wheels + name: drakpdb-wheels path: ./dist/* From c918521a7265cf6c6336f665a694d97aeb727054 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Srokosz?= Date: Wed, 31 Jul 2024 18:49:15 +0200 Subject: [PATCH 7/7] Update build.yml --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 833860a..a0fa27a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -3,9 +3,6 @@ on: push: branches: - master - pull_request: - branches: - - master jobs: build: