From 704f1ba1ad53c611085b74f56d32f6ed20ecb3b1 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 19 Jun 2025 20:51:12 +0530 Subject: [PATCH 1/2] Bump commoncode to v32.3.0 Signed-off-by: Ayan Sinha Mahapatra --- CHANGELOG.rst | 22 +++++++++++++++------- requirements.txt | 3 +++ setup.cfg | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 17228be..6b5e050 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,16 +1,13 @@ Changelog ========= - -v0.1.0 +v0.1.2 ------ -Initial release with support for: +Bugfix release to fix click compatibility issues: + +* Update commoncode to latest v32.3.0 with click compatibility fixes -* Get parsed list of demangled and cleaned symbols from a winpe binary -* Get parsed list of demangled and cleaned symbols from a macho binary -* scancode-toolkit plugins for collecting symbols from macho and winpe binaries - with the CLI option --winpe-symbol --macho-symbol v0.1.1 ------ @@ -19,3 +16,14 @@ Bugfix release as the intial release had empty wheels: * Fix binary-inspector wheels to have the necessary modules. * Update to latest skeleton + + +v0.1.0 +------ + +Initial release with support for: + +* Get parsed list of demangled and cleaned symbols from a winpe binary +* Get parsed list of demangled and cleaned symbols from a macho binary +* scancode-toolkit plugins for collecting symbols from macho and winpe binaries + with the CLI option --winpe-symbol --macho-symbol diff --git a/requirements.txt b/requirements.txt index 3116e68..6e08559 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,6 @@ # https://github.com/owasp-dep-scan/blint/blob/1e1250a4bf6c25eccba8970bd877901ee56070c7/poetry.lock lief==0.15.1 symbolic==10.2.1 +click==8.2.1;python_version>='3.10' +click==8.1.8;python_version<'3.10' +commoncode==32.3.0 \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 0d736e7..d758725 100644 --- a/setup.cfg +++ b/setup.cfg @@ -42,7 +42,8 @@ setup_requires = setuptools_scm[toml] >= 4 python_requires = >=3.9 install_requires = - click<8.2 + click >= 6.7, !=7.0;python_version<'3.10' + click >= 8.2.0;python_version>='3.10' commoncode plugincode typecode From 70b6205901bc58e9e573822eceb50910df0477f8 Mon Sep 17 00:00:00 2001 From: Ayan Sinha Mahapatra Date: Thu, 19 Jun 2025 20:58:35 +0530 Subject: [PATCH 2/2] Add tests in Github Actions CI Signed-off-by: Ayan Sinha Mahapatra --- .github/workflows/tests.yml | 27 +++++++++++++++++++++++++++ requirements.txt | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/tests.yml diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml new file mode 100644 index 0000000..d6116a8 --- /dev/null +++ b/.github/workflows/tests.yml @@ -0,0 +1,27 @@ +name: Run tests on supported Python versions + +on: [push, pull_request, workflow_dispatch] + +jobs: + extensive_tests: + name: Run tests on Python ${{ matrix.python }} + runs-on: ${{ matrix.os }} + defaults: + run: + shell: bash + strategy: + fail-fast: false + matrix: + python: ["3.9", "3.10", "3.11", "3.12", "3.13"] + os: ["ubuntu-latest"] + + steps: + - uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: "${{ matrix.python }}" + + - name: Run tests + run: make clean && make dev && make test diff --git a/requirements.txt b/requirements.txt index 6e08559..43a053f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ lief==0.15.1 symbolic==10.2.1 click==8.2.1;python_version>='3.10' -click==8.1.8;python_version<'3.10' +click==8.1.7;python_version<'3.10' commoncode==32.3.0 \ No newline at end of file