Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support #4606

vedpawar2254 · 2024-12-07T14:15:48Z

Improved the alt-text in Architecture and Metrics in Manual.md
solves #4604

and fixes issue #4579 Removed python 3.8 support
remove python 3.8 from testing.yml
[x] remove any package workarounds that reference python 3.8 (there's some in dev-requirements.txt for sure)
[x] change configuration for pyupgrade in .pre-commit-config.yaml
[x] look through code to see if we have other python 3.8 specific workarounds that should be flagged for eventual [x] removal (can set up separate issues for these if we don't want to pull them out right away). There might be a couple in the tests specifically.

vedpawar2254 · 2024-12-07T14:17:43Z

@terriko Let me know the changes are satisfactory or should i add more detail

vedpawar2254 · 2024-12-08T12:00:09Z

I have also solved issue #4579 in this PR

terriko

This looks promising, but there's a lot going on here and I think we're going to need to split it up and remove a couple of files.

I recommend you learn how to use git branches and make separate ones for each logical change (i.e. one for docs: Improve alt-text in Architecture and Metrics #4604 and one for ci: remove python 3.8 support #4579). You can probably just search for a nice tutorial for how and why to use branches but here's our short version: https://github.com/intel/cve-bin-tool/blob/main/CONTRIBUTING.md#making-a-new-branch--pull-request
It looks like you accidentally checked in some output files . I've flagged them with comments below. (I'm guessing you ran git add * in the main directory and it picked up some stuff that shouldn't be checked in. Usually it's better to name specific files for git add to avoid this.)
It looks like we're getting an error about how black is run. It's likely because of your changes in dev-requirements.txt (it claims you're trying to install both 24.10.0 and 24.8.0 which is what is going on). You could probably leave those for another PR if you want to just deal with it later.

If you get stuck figuring out how to split this up and use branches, folk in our gitter can probably help you: https://gitter.im/cve-bin-tool/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge

The actual changes look decent, but it's a bit hard to figure out what's going on with the tests failing so let's try to get this split up and cleaned up!

terriko · 2024-12-11T16:55:59Z

epss_percentile.csv

@@ -0,0 +1 @@
+vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments,epss_probability,epss_percentile


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:56:16Z

epss_probability.csv

@@ -0,0 +1 @@
+vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments,epss_probability,epss_percentile


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:56:21Z

output.cve-bin-tool.2024-12-08.16-33-19.csv

@@ -0,0 +1,8 @@
+vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:56:26Z

output.cve-bin-tool.2024-12-08.16-33-19.json

@@ -0,0 +1,115 @@
+[


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:56:38Z

sevtest.csv

@@ -0,0 +1 @@
+vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:57:13Z

test.sbom

@@ -0,0 +1,11 @@
+SPDXVersion: SPDX-2.3


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:57:27Z

test-report.html

I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T16:59:40Z

test/README.md

@@ -75,7 +75,7 @@ The recommended way to do this yourself is to use python's `virtualenv`
 You can set up virtualenv for all these environments:

 ```console
-virtualenv -p python3.8 venv3.8
+virtualenv -p python3.9 venv3.8


Suggested change

virtualenv -p python3.9 venv3.8

virtualenv -p python3.12 venv3.12

So, what this is doing is making a directory name that matches the version of python. The way you had it written you'd wind up with a venv that was named 3.8 but actually used python 3.9, which would be very confusing later. Let's just go ahead and use a more recent venison of python in the example instead.

terriko · 2024-12-11T17:00:10Z

testfile.csv

@@ -0,0 +1 @@
+testing


I think this might have been checked in by mistake and should be removed.

terriko · 2024-12-11T17:06:07Z

dev-requirements.txt

-isort; python_version < "3.8"
-isort==5.13.2; python_version >= "3.8"
-pre-commit; python_version <= "3.8"
+black==24.8.0;


Suggested change

black==24.8.0;

black==24.10.0;

You'll want to delete line 1 too -- right now you're telling it to install black 24.8.0 and 24.10.0 which isn't going to work.

vedpawar2254 · 2024-12-11T19:06:23Z

Thanks @terriko i'll make the changes asap

* related: intel#4606 There's a good PR intel#4606 which includes removing some python 3.8-isms, but it's going to take a bit longer before it's ready to merge because some other stuff got accidentally commited. This PR disables the SBOM and testing workflows so I don't have to deal with them over the holidays while we wait for intel#4606 to be fully ready. Signed-off-by: Terri Oda <terri.oda@intel.com>

* related: #4606 There's a good PR #4606 which includes removing some python 3.8-isms, but it's going to take a bit longer before it's ready to merge because some other stuff got accidentally commited. This PR disables the SBOM and testing workflows so I don't have to deal with them over the holidays while we wait for #4606 to be fully ready. Signed-off-by: Terri Oda <terri.oda@intel.com>

vedpawar2254 · 2024-12-24T12:22:13Z

Hi @terriko , it looks like most of the work for issue #4579 is done(let me know if anymore is needed) also sorry for the delay, I had my endsems to blame for it, but i'll be regularly contributing now, I have also raised a PR for #4604 and I a can raise another one for #4579 if needed,
Again sorry for the delay

vedpawar2254 changed the title ~~Solves issue #4604, improved alt-text in Architecture and Metrics~~ Solves issue #4604, improved alt-text in Architecture and Metrics AND issue #4579 Removed python 3.8 support Dec 8, 2024

vedpawar2254 changed the title ~~Solves issue #4604, improved alt-text in Architecture and Metrics AND issue #4579 Removed python 3.8 support~~ Solves issue #4604, improved alt-text in Architecture and Metrics AND fixes issue #4579 Removed python 3.8 support Dec 8, 2024

vedpawar2254 changed the title ~~Solves issue #4604, improved alt-text in Architecture and Metrics AND fixes issue #4579 Removed python 3.8 support~~ Fixes issue #4604, improved alt-text in Architecture and Metrics AND fixes issue #4579 Removed python 3.8 support Dec 8, 2024

vedpawar2254 changed the title ~~Fixes issue #4604, improved alt-text in Architecture and Metrics AND fixes issue #4579 Removed python 3.8 support~~ Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support Dec 8, 2024

terriko requested changes Dec 11, 2024

View reviewed changes

terriko mentioned this pull request Dec 23, 2024

ci: disable python 3.8 testing & sbom #4647

Merged

vedpawar2254 closed this Dec 24, 2024

vedpawar2254 force-pushed the main branch from d8a2f38 to d071e7a Compare December 24, 2024 12:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support #4606

Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support #4606

vedpawar2254 commented Dec 7, 2024 •

edited

Loading

vedpawar2254 commented Dec 7, 2024

vedpawar2254 commented Dec 8, 2024

terriko left a comment

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

terriko Dec 11, 2024

vedpawar2254 commented Dec 11, 2024

vedpawar2254 commented Dec 24, 2024

		@@ -0,0 +1 @@
		vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments,epss_probability,epss_percentile

		@@ -0,0 +1,8 @@
		vendor,product,version,location,cve_number,severity,score,source,cvss_version,cvss_vector,paths,remarks,comments

	virtualenv -p python3.9 venv3.8
	virtualenv -p python3.12 venv3.12

Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support #4606

Fixes #4604, improved alt-text in Architecture and Metrics AND fixes #4579 Removed python 3.8 support #4606

Conversation

vedpawar2254 commented Dec 7, 2024 • edited Loading

vedpawar2254 commented Dec 7, 2024

vedpawar2254 commented Dec 8, 2024

terriko left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vedpawar2254 commented Dec 11, 2024

vedpawar2254 commented Dec 24, 2024

vedpawar2254 commented Dec 7, 2024 •

edited

Loading