From ab2996c178fff713f7d3d93841f34bdfb0319275 Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 29 Jul 2024 10:53:40 -0400 Subject: [PATCH 1/2] CVE-2024-38335 recommends ~> 70.0.0... and classifies this the severity as "High severity" --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 10216e1..5afb748 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools>=61.2", + "setuptools~>70.0.0", # needed for building tables for the sdist: "PyYAML", "click", From df4e945ec8128982b031afdfb630f326280ad084 Mon Sep 17 00:00:00 2001 From: rocky Date: Mon, 29 Jul 2024 11:02:43 -0400 Subject: [PATCH 2/2] CVE-2024-38335 and some small lint --- mathics_scanner/tokeniser.py | 2 +- pyproject.toml | 2 +- setup.py | 7 ------- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/mathics_scanner/tokeniser.py b/mathics_scanner/tokeniser.py index 1609401..a35351f 100644 --- a/mathics_scanner/tokeniser.py +++ b/mathics_scanner/tokeniser.py @@ -359,7 +359,7 @@ class Tokeniser: def __init__(self, feeder): """ feeder: An instance of ``LineFeeder`` from which we receive - input srings that are to be split up and put into tokens. + input strings that are to be split up and put into tokens. """ self.pos: int = 0 self.feeder = feeder diff --git a/pyproject.toml b/pyproject.toml index 5afb748..10298dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [build-system] requires = [ - "setuptools~>70.0.0", + "setuptools>=70.0.0", # CVE-2024-38335 recommends this # needed for building tables for the sdist: "PyYAML", "click", diff --git a/setup.py b/setup.py index 2cdff24..5e8a4c9 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,6 @@ """ import os.path as osp -import platform import re import subprocess import sys @@ -35,12 +34,6 @@ from setuptools.command.egg_info import egg_info -# Ensure user has the correct Python version -if sys.version_info < (3, 7): - print("mathics-scanner does not support Python %d.%d" % sys.version_info[:2]) - sys.exit(-1) - - def get_srcdir(): filename = osp.normcase(osp.dirname(osp.abspath(__file__))) return osp.realpath(filename)