Skip to content

Commit

Permalink
Merge pull request #42 from Cisco-Talos/setuptools
Browse files Browse the repository at this point in the history
Add setuptool as dependency and bump minor version (0.4.1)
  • Loading branch information
micahsnyder authored Jan 2, 2025
2 parents 625ef9e + a846a75 commit 8621c1c
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@

setuptools.setup(
name="mussels",
version="0.4.0",
version="0.4.1",
author="Micah Snyder",
author_email="[email protected]",
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",
Expand All @@ -28,6 +28,7 @@
"patch",
"gitpython",
"pyyaml",
"setuptools",
],
classifiers=[
"Programming Language :: Python :: 3",
Expand Down

0 comments on commit 8621c1c

Please sign in to comment.