From bb627742593826d8f3062e7ecca6a49714366f45 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 13:40:35 -0700 Subject: [PATCH 1/6] Remove ppbt as install requirement --- setup.cfg | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index db761e6b..bf76764a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,13 +17,17 @@ packages = find: package_dir = relenv = relenv include_package_data = True -install_requires = - ppbt; sys_platform == "linux" +setup_requires = + ppbt + [options.entry_points] console_scripts = relenv = relenv.__main__:main +[options.extras_require] +toolchain = ppbt + [sdist] owner = root group = root From fbfdfb8baee5d1d8000121670a507fa026f97353 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 16:37:16 -0700 Subject: [PATCH 2/6] Limit ppbt to linux --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index bf76764a..c2775701 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,7 +18,7 @@ package_dir = relenv = relenv include_package_data = True setup_requires = - ppbt + ppbt ; sys_platform == "linux" [options.entry_points] From d3c1e107e24260d09a48de9c503803744f276a4d Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 16:38:41 -0700 Subject: [PATCH 3/6] Remove ppbt from relenv build reqs --- setup.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index c2775701..16579870 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,8 +17,6 @@ packages = find: package_dir = relenv = relenv include_package_data = True -setup_requires = - ppbt ; sys_platform == "linux" [options.entry_points] From 4a5e309213987c0e87939c308fabadebc58a0139 Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 17:44:05 -0700 Subject: [PATCH 4/6] Bump runner os version --- .github/workflows/docs-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-action.yml b/.github/workflows/docs-action.yml index f0693538..b3679d4e 100644 --- a/.github/workflows/docs-action.yml +++ b/.github/workflows/docs-action.yml @@ -11,7 +11,7 @@ on: jobs: docs: name: Build Relenv Documentation - runs-on: ubuntu-20.04 + runs-on: ubuntu-24.04 steps: - name: Install System Deps From 73d236a05f39cc3f3402d7b1b1f1a2fdf72f24fb Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 17:49:04 -0700 Subject: [PATCH 5/6] Fix package name on new runner os --- .github/workflows/docs-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs-action.yml b/.github/workflows/docs-action.yml index b3679d4e..b1d24ed4 100644 --- a/.github/workflows/docs-action.yml +++ b/.github/workflows/docs-action.yml @@ -17,7 +17,7 @@ jobs: - name: Install System Deps run: | sudo apt-get update - sudo apt-get install -y enchant git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils + sudo apt-get install -y enchant-2 git gcc imagemagick make zlib1g-dev libc-dev libffi-dev g++ libxml2 libxml2-dev libxslt-dev libcurl4-openssl-dev libssl-dev libgnutls28-dev xz-utils - uses: actions/checkout@v3 with: From 3239f2f7a8754358e8d3570d646f9d641553d7ae Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Thu, 8 May 2025 17:58:08 -0700 Subject: [PATCH 6/6] Set python version --- .github/workflows/docs-action.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docs-action.yml b/.github/workflows/docs-action.yml index b1d24ed4..270dd977 100644 --- a/.github/workflows/docs-action.yml +++ b/.github/workflows/docs-action.yml @@ -14,6 +14,11 @@ jobs: runs-on: ubuntu-24.04 steps: + - name: Setup Python 3.11 + uses: actions/setup-python@v5 + with: + python-version: 3.11 + - name: Install System Deps run: | sudo apt-get update