From 1cec3acd1198ab9b6bcb6547246f3611e9b1cc33 Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Thu, 2 Jan 2025 15:07:15 -0500 Subject: [PATCH 1/3] Add setuptools to install_requires Fixes ModuleNotFoundError: No module named 'pkg_resources' --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index c164695..8437cd9 100644 --- a/setup.py +++ b/setup.py @@ -28,6 +28,7 @@ "patch", "gitpython", "pyyaml", + "setuptools", ], classifiers=[ "Programming Language :: Python :: 3", From a2f434af43196afd02329833c18ddcabf75cdada Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Thu, 2 Jan 2025 15:12:19 -0500 Subject: [PATCH 2/3] Bump version to 0.4.1 Also add release notes --- CHANGES.md | 4 ++++ setup.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 23091d8..e400c70 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,10 @@ > - Fixed: 🐛 > - Security: 🛡 +## Version 0.4.1 + +🐛 Fixed an issue using pkg_resources package when setuptools is not installed. The fix adds setuptools as a dependency. + ## Version 0.4.0 ### Added diff --git a/setup.py b/setup.py index 8437cd9..8c16cf0 100644 --- a/setup.py +++ b/setup.py @@ -5,10 +5,10 @@ setuptools.setup( name="mussels", - version="0.4.0", + version="0.4.1", author="Micah Snyder", author_email="micasnyd@cisco.com", - copyright="Copyright (C) 2023 Cisco Systems, Inc. and/or its affiliates. All rights reserved.", + copyright="Copyright (C) 2025 Cisco Systems, Inc. and/or its affiliates. All rights reserved.", description="Mussels Dependency Build Automation Tool", long_description=long_description, long_description_content_type="text/markdown", From a846a75138943f6611a2c33a81b9934fa787f47b Mon Sep 17 00:00:00 2001 From: Micah Snyder Date: Thu, 2 Jan 2025 15:15:42 -0500 Subject: [PATCH 3/3] Tests: upgrade python from 3.7 to 3.12 3.7 is no longer available. --- .github/workflows/pypi.yml | 4 ++-- .github/workflows/unittests.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml index 17451c3..f25a491 100644 --- a/.github/workflows/pypi.yml +++ b/.github/workflows/pypi.yml @@ -10,10 +10,10 @@ jobs: steps: - uses: actions/checkout@master - - name: Set up Python 3.7 + - name: Set up Python 3.12 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.12 - name: Install pypa/build run: >- diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index f43b3ed..be1c706 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v1 - - name: Set up Python 3.7 + - name: Set up Python 3.12 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.12 - name: Install dependencies run: | python -m pip install --upgrade pip