diff options
| author | Adam Janovsky | 2023-02-03 12:05:22 +0100 |
|---|---|---|
| committer | Adam Janovsky | 2023-02-03 12:05:22 +0100 |
| commit | e5465f38f053941e0bcf3387da4e49394e169ee0 (patch) | |
| tree | 18a5eaa7d0e163c1d0fa4b797488760bcbd41fdd | |
| parent | 4d34a407bad7327398826597c33bc1fdf4c251f3 (diff) | |
| download | sec-certs-e5465f38f053941e0bcf3387da4e49394e169ee0.tar.gz sec-certs-e5465f38f053941e0bcf3387da4e49394e169ee0.tar.zst sec-certs-e5465f38f053941e0bcf3387da4e49394e169ee0.zip | |
pin linter versions, fix some lint problems
| -rw-r--r-- | .github/workflows/lint.yml | 5 | ||||
| -rw-r--r-- | .pre-commit-config.yaml | 4 | ||||
| -rw-r--r-- | pyproject.toml | 6 | ||||
| -rw-r--r-- | requirements/dev_requirements.txt | 5 | ||||
| -rw-r--r-- | src/sec_certs/cli.py | 1 | ||||
| -rw-r--r-- | src/sec_certs/dataset/protection_profile.py | 1 | ||||
| -rw-r--r-- | src/sec_certs/model/reference_finder.py | 2 | ||||
| -rw-r--r-- | src/sec_certs/model/transitive_vulnerability_finder.py | 1 | ||||
| -rw-r--r-- | src/sec_certs/utils/parallel_processing.py | 1 |
9 files changed, 13 insertions, 13 deletions
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e4fb0b84..90e4a459 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -24,6 +24,9 @@ jobs: steps: - uses: actions/checkout@v3 - uses: psf/black@stable + with: + version: "23.1.0" + options: "--check --target-version py38" ruff: runs-on: ubuntu-latest steps: @@ -34,6 +37,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install ruff + pip install ruff==v0.0.239 - name: Run Ruff run: ruff --format=github . diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 391cd6c6..8501c280 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,6 +1,6 @@ repos: - repo: https://github.com/psf/black - rev: 22.6.0 + rev: 23.1.0 hooks: - id: black args: ["--check", "--target-version", "py38"] @@ -10,7 +10,7 @@ repos: hooks: - id: ruff - repo: https://github.com/pre-commit/mirrors-mypy - rev: "v0.982" + rev: "v0.991" hooks: - id: mypy additional_dependencies: diff --git a/pyproject.toml b/pyproject.toml index d77c8b75..7026dff1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -62,7 +62,9 @@ [project.optional-dependencies] dev = [ - "mypy", + "mypy==0.991", + "black==23.1.0", + "ruff==0.0.239", "types-PyYAML", "types-python-dateutil", "types-requests", @@ -70,7 +72,6 @@ "pytest-cov", "pytest-monitor", "pytest-profiling", - "black", "pre-commit", "pip-tools", "sphinx", @@ -79,7 +80,6 @@ "sphinx-design", "sphinx-copybutton", "ipython!=8.7.0", - "ruff", ] test = ["pytest", "coverage", "pytest-cov"] diff --git a/requirements/dev_requirements.txt b/requirements/dev_requirements.txt index a0ba8ac6..51418587 100644 --- a/requirements/dev_requirements.txt +++ b/requirements/dev_requirements.txt @@ -21,7 +21,7 @@ beautifulsoup4==4.11.1 # sec-certs (./../pyproject.toml) billiard==4.0.2 # via sec-certs (./../pyproject.toml) -black==22.10.0 +black==23.1.0 # via sec-certs (./../pyproject.toml) blis==0.7.9 # via thinc @@ -224,6 +224,7 @@ numpy==1.23.5 # thinc packaging==22.0 # via + # black # build # deprecation # ipykernel @@ -354,7 +355,7 @@ requests==2.28.1 # sec-certs (./../pyproject.toml) # spacy # sphinx -ruff==0.0.236 +ruff==0.0.239 # via sec-certs (./../pyproject.toml) scikit-learn==1.2.0 # via sec-certs (./../pyproject.toml) diff --git a/src/sec_certs/cli.py b/src/sec_certs/cli.py index 751c4655..96347787 100644 --- a/src/sec_certs/cli.py +++ b/src/sec_certs/cli.py @@ -63,7 +63,6 @@ def build_or_load_dataset( to_build: bool, outputpath: Path | None, ) -> CCDataset | FIPSDataset: - constructor: type[CCDataset] | type[FIPSDataset] = CCDataset if framework == "cc" else FIPSDataset dset: CCDataset | FIPSDataset diff --git a/src/sec_certs/dataset/protection_profile.py b/src/sec_certs/dataset/protection_profile.py index 3edd445d..9730a477 100644 --- a/src/sec_certs/dataset/protection_profile.py +++ b/src/sec_certs/dataset/protection_profile.py @@ -83,7 +83,6 @@ class ProtectionProfileDataset: @classmethod def from_web(cls, store_dataset_path: Path | None = None): - logger.info(f"Downloading static PP dataset from: {config.pp_latest_snapshot}") if not store_dataset_path: tmp = tempfile.TemporaryDirectory() diff --git a/src/sec_certs/model/reference_finder.py b/src/sec_certs/model/reference_finder.py index 117a8b9d..94a3b29f 100644 --- a/src/sec_certs/model/reference_finder.py +++ b/src/sec_certs/model/reference_finder.py @@ -23,7 +23,7 @@ class ReferenceFinder: The fit is called on a dictionary of certificates, builds a hashmap of references, and assigns references for each certificate in the dictionary. """ - def __init__(self): + def __init__(self: ReferenceFinder) -> None: self.references: ReferencesType = {} self.id_mapping: IDMapping = {} self._fitted: bool = False diff --git a/src/sec_certs/model/transitive_vulnerability_finder.py b/src/sec_certs/model/transitive_vulnerability_finder.py index 6ae6fa0b..5eafea93 100644 --- a/src/sec_certs/model/transitive_vulnerability_finder.py +++ b/src/sec_certs/model/transitive_vulnerability_finder.py @@ -53,7 +53,6 @@ class TransitiveVulnerabilityFinder: def _get_cert_transitive_cves( self, cert: CertSubType, reference_type: ReferenceType, ref_func: ReferenceLookupFunc ) -> set[str] | None: - references = ( ref_func(cert).directly_referenced_by if reference_type == ReferenceType.DIRECT diff --git a/src/sec_certs/utils/parallel_processing.py b/src/sec_certs/utils/parallel_processing.py index ab0b4266..b3016695 100644 --- a/src/sec_certs/utils/parallel_processing.py +++ b/src/sec_certs/utils/parallel_processing.py @@ -21,7 +21,6 @@ def process_parallel( unpack: bool = False, progress_bar_desc: str | None = None, ) -> list[Any]: - if max_workers == -1: max_workers = cpu_count() |
