Merge pull request #73 from cisagov/goose-2.1.0

Goose v2.1.0
cisagov · Feb 19, 2025 · 1443ddb · 1443ddb
2 parents e687867 + 465672b
commit 1443ddb
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 45 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.1.0] - Enter the honk - 2024-02-19
+### Added
+- Added support for python 3.13
+
 ## [2.0.4] - Enter the honk - 2024-01-28
 ### Changed
 - Create_SP.ps1 script no longer prompts for cloudshell

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12-slim
+FROM python:3.13-slim
 
 RUN apt-get update
 

diff --git a/cyclonedx_output.json b/cyclonedx_output.json
@@ -2,10 +2,10 @@
   "$schema": "http://cyclonedx.org/schema/bom-1.4.schema.json",
   "bomFormat": "CycloneDX",
   "specVersion": "1.4",
-  "serialNumber": "urn:uuid:4c086e7a-0919-4c2d-8a22-45c2dc982c23",
+  "serialNumber": "urn:uuid:62f15981-2265-4677-88b8-b0b6b070b94f",
   "version": 1,
   "metadata": {
-    "timestamp": "2025-01-29T13:07:28-05:00",
+    "timestamp": "2025-02-19T12:35:49-05:00",
     "tools": [
       {
         "vendor": "anchore",
@@ -3831,12 +3831,12 @@
       ]
     },
     {
-      "bom-ref": "pkg:pypi/fire@0.6.0?package-id=a3d813347f24f3b3",
+      "bom-ref": "pkg:pypi/fire@0.7.0?package-id=24446619b8f1cda0",
       "type": "library",
       "name": "fire",
-      "version": "0.6.0",
-      "cpe": "cpe:2.3:a:python-fire:python-fire:0.6.0:*:*:*:*:*:*:*",
-      "purl": "pkg:pypi/fire@0.6.0",
+      "version": "0.7.0",
+      "cpe": "cpe:2.3:a:python-fire:python-fire:0.7.0:*:*:*:*:*:*:*",
+      "purl": "pkg:pypi/fire@0.7.0",
       "properties": [
         {
           "name": "syft:package:foundBy",
@@ -3856,47 +3856,47 @@
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python-fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python-fire:python_fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python_fire:python-fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python_fire:python-fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python_fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python_fire:python_fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python:python-fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python:python-fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python:python_fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python:python_fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:fire:python-fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:fire:python-fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:fire:python_fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python-fire:fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python-fire:fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python_fire:fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python_fire:fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:python:fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:python:fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:cpe23",
-          "value": "cpe:2.3:a:fire:fire:0.6.0:*:*:*:*:*:*:*"
+          "value": "cpe:2.3:a:fire:fire:0.7.0:*:*:*:*:*:*:*"
         },
         {
           "name": "syft:location:0:path",

diff --git a/requirements.txt b/requirements.txt
@@ -22,7 +22,7 @@ cryptography==43.0.1
 darkdetect==0.8.0
 docstring-parser==0.16
 et-xmlfile==1.1.0
-fire==0.6.0
+fire==0.7.0
 frozenlist==1.4.1
 h11==0.14.0
 httplib2==0.22.0

diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@
 
 if sys.version_info < (3,9):
     sys.exit("The current Python version is less than 3.9. Exiting.")
-elif sys.version_info >= (3,13):
-    sys.exit("The current Python version is greater than 3.12. Exiting.")
+elif sys.version_info >= (3,14):
+    sys.exit("The current Python version is greater than 3.13. Exiting.")
 
 requirements_filepath = path.join(path.dirname(path.abspath(__file__)), "requirements.txt")
 requirements = open(requirements_filepath).read().split()
@@ -21,6 +21,7 @@
           'Programming Language :: Python :: 3.10',
           'Programming Language :: Python :: 3.11',
           'Programming Language :: Python :: 3.12',
+          'Programming Language :: Python :: 3.13',
       ],
       packages=['goosey'],
       python_requires='>=3.9',

diff --git a/spdx_output.json b/spdx_output.json
@@ -3,14 +3,14 @@
  "dataLicense": "CC0-1.0",
  "SPDXID": "SPDXRef-DOCUMENT",
  "name": "untitledgoosetool",
- "documentNamespace": "https://anchore.com/syft/dir/untitledgoosetool-fb8c7c16-ce25-4c7b-8938-5674155f7f3b",
+ "documentNamespace": "https://anchore.com/syft/dir/untitledgoosetool-b095ab3b-49e1-492f-91be-4b7a31ac7574",
  "creationInfo": {
   "licenseListVersion": "3.21",
   "creators": [
    "Organization: Anchore, Inc",
    "Tool: syft-0.90.0"
   ],
-  "created": "2025-01-29T18:07:28Z"
+  "created": "2025-02-19T17:35:48Z"
  },
  "packages": [
   {
@@ -4413,8 +4413,8 @@
   },
   {
    "name": "fire",
-   "SPDXID": "SPDXRef-Package-python-fire-a3d813347f24f3b3",
-   "versionInfo": "0.6.0",
+   "SPDXID": "SPDXRef-Package-python-fire-24446619b8f1cda0",
+   "versionInfo": "0.7.0",
    "supplier": "NOASSERTION",
    "downloadLocation": "NOASSERTION",
    "filesAnalyzed": false,
@@ -4426,67 +4426,67 @@
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python-fire:python-fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python-fire:python-fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python-fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python-fire:python_fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python_fire:python-fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python_fire:python-fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python_fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python_fire:python_fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python:python-fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python:python-fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python:python_fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python:python_fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:fire:python-fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:fire:python-fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:fire:python_fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:fire:python_fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python-fire:fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python-fire:fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python_fire:fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python_fire:fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:python:fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:python:fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "SECURITY",
      "referenceType": "cpe23Type",
-     "referenceLocator": "cpe:2.3:a:fire:fire:0.6.0:*:*:*:*:*:*:*"
+     "referenceLocator": "cpe:2.3:a:fire:fire:0.7.0:*:*:*:*:*:*:*"
     },
     {
      "referenceCategory": "PACKAGE-MANAGER",
      "referenceType": "purl",
-     "referenceLocator": "pkg:pypi/fire@0.6.0"
+     "referenceLocator": "pkg:pypi/fire@0.7.0"
     }
    ]
   },
@@ -8287,6 +8287,12 @@
    "relationshipType": "OTHER",
    "comment": "evident-by: indicates the package's existence is evident by the given file"
   },
+  {
+   "spdxElementId": "SPDXRef-Package-python-fire-24446619b8f1cda0",
+   "relatedSpdxElement": "SPDXRef-File-requirements.txt-26ca2b7dc025d550",
+   "relationshipType": "OTHER",
+   "comment": "evident-by: indicates the package's existence is evident by the given file"
+  },
   {
    "spdxElementId": "SPDXRef-Package-python-zipp-24caf9ae9b8c4214",
    "relatedSpdxElement": "SPDXRef-File-requirements.txt-26ca2b7dc025d550",
@@ -8521,12 +8527,6 @@
    "relationshipType": "OTHER",
    "comment": "evident-by: indicates the package's existence is evident by the given file"
   },
-  {
-   "spdxElementId": "SPDXRef-Package-python-fire-a3d813347f24f3b3",
-   "relatedSpdxElement": "SPDXRef-File-requirements.txt-26ca2b7dc025d550",
-   "relationshipType": "OTHER",
-   "comment": "evident-by: indicates the package's existence is evident by the given file"
-  },
   {
    "spdxElementId": "SPDXRef-Package-python-httplib2-a9428a253764f15b",
    "relatedSpdxElement": "SPDXRef-File-requirements.txt-26ca2b7dc025d550",
@@ -8784,7 +8784,7 @@
   },
   {
    "spdxElementId": "SPDXRef-DocumentRoot-Directory-untitledgoosetool",
-   "relatedSpdxElement": "SPDXRef-Package-python-fire-a3d813347f24f3b3",
+   "relatedSpdxElement": "SPDXRef-Package-python-fire-24446619b8f1cda0",
    "relationshipType": "CONTAINS"
   },
   {