From e9d5a57871822a508c1fdd2c7f19744ea9ce5ab7 Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 7 Apr 2024 10:15:12 +0200 Subject: [PATCH 1/4] Removed deprecated bdist_rpm setuptools configuration --- setup.cfg | 6 ------ 1 file changed, 6 deletions(-) diff --git a/setup.cfg b/setup.cfg index b95c083..de274e1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -16,9 +16,3 @@ classifiers = [options] python_requires = >=3.7 - -[bdist_rpm] -release = 1 -packager = Joachim Metz -doc_files = LICENSE sleuthkit/licenses/cpl1.0.txt sleuthkit/licenses/IBM-LICENSE README -build_requires = python-setuptools From ccf572f1e979d3c20a5b75096b75682588f1a86c Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 7 Apr 2024 10:27:23 +0200 Subject: [PATCH 2/4] Applied updates --- .github/workflows/build.yml | 8 +++----- setup.cfg | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e88fccf..5e907c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,8 @@ jobs: strategy: matrix: include: - - python-version: '3.11' - toxenv: 'py311' + - python-version: '3.12' + toxenv: 'py312' steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} @@ -32,8 +32,6 @@ jobs: strategy: matrix: include: - - python-version: '3.7' - toxenv: 'py37' - python-version: '3.8' toxenv: 'py38' - python-version: '3.9' @@ -65,7 +63,7 @@ jobs: runs-on: windows-latest strategy: matrix: - python-version: ['3.11'] + python-version: ['3.12'] architecture: ['x86', 'x64'] steps: - uses: actions/checkout@v3 diff --git a/setup.cfg b/setup.cfg index de274e1..f4b7a0f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,4 +15,4 @@ classifiers = Programming Language :: Python [options] -python_requires = >=3.7 +python_requires = >=3.8 From 33b2986a77babd816fc36be9a2512ee49937b8ff Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 7 Apr 2024 10:42:04 +0200 Subject: [PATCH 3/4] Applied updates --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e907c6..7ce881c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,7 +18,7 @@ jobs: - name: Install build dependencies run: | brew update -q - brew install -q autoconf automake gettext gnu-sed pkgconfig python@${{ matrix.python-version }} tox + brew install -q autoconf automake gettext gnu-sed pkgconfig python@${{ matrix.python-version }} python-setuptools tox brew link --force gettext ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize - name: Build and test Python module @@ -71,6 +71,9 @@ jobs: uses: actions/setup-python@v1 with: python-version: ${{ matrix.python-version }} + - name: Install build dependencies + run: | + python3 -m pip install setuptools - name: Build Python module run: | python setup.py update From 429253b5956707b4ca6c4042295240b0be72b60a Mon Sep 17 00:00:00 2001 From: Joachim Metz Date: Sun, 7 Apr 2024 10:46:11 +0200 Subject: [PATCH 4/4] Applied updates --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7ce881c..048b2c5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,9 +18,10 @@ jobs: - name: Install build dependencies run: | brew update -q - brew install -q autoconf automake gettext gnu-sed pkgconfig python@${{ matrix.python-version }} python-setuptools tox + brew install -q autoconf automake gettext gnu-sed pkgconfig python@${{ matrix.python-version }} tox brew link --force gettext ln -s /usr/local/bin/glibtoolize /usr/local/bin/libtoolize + python3 -m pip install setuptools - name: Build and test Python module run: | python setup.py update