diff options
| author | adamjanovsky | 2025-02-13 13:28:31 +0100 |
|---|---|---|
| committer | GitHub | 2025-02-13 13:28:31 +0100 |
| commit | 443d38c9cf6d6e76c6667484a185839dd821fd11 (patch) | |
| tree | 508ac726d9408dc4917c1ced920f53447e9b64ac /src/sec_certs/dataset | |
| parent | bdbd974847b713d14ccd90b617bae4e41447c09e (diff) | |
| parent | ba6da69bffd99a49a830de988af300108f3f8d80 (diff) | |
| download | sec-certs-0.3.1.tar.gz sec-certs-0.3.1.tar.zst sec-certs-0.3.1.zip | |
Merge pull request #473 from crocs-muni/pre-release-fixes0.3.1
Pre-release fixes
Diffstat (limited to 'src/sec_certs/dataset')
| -rw-r--r-- | src/sec_certs/dataset/auxiliary_dataset_handling.py | 2 | ||||
| -rw-r--r-- | src/sec_certs/dataset/cc.py | 2 | ||||
| -rw-r--r-- | src/sec_certs/dataset/dataset.py | 2 | ||||
| -rw-r--r-- | src/sec_certs/dataset/protection_profile.py | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/sec_certs/dataset/auxiliary_dataset_handling.py b/src/sec_certs/dataset/auxiliary_dataset_handling.py index 11608a2e..69d5e837 100644 --- a/src/sec_certs/dataset/auxiliary_dataset_handling.py +++ b/src/sec_certs/dataset/auxiliary_dataset_handling.py @@ -258,7 +258,7 @@ class ProtectionProfileDatasetHandler(AuxiliaryDatasetHandler): @property def dset_path(self) -> Path: - return self.root_dir / "pp.json" + return self.root_dir / "dataset.json" def load_dataset(self) -> None: from sec_certs.dataset.protection_profile import ProtectionProfileDataset diff --git a/src/sec_certs/dataset/cc.py b/src/sec_certs/dataset/cc.py index 05e29a27..fb90c142 100644 --- a/src/sec_certs/dataset/cc.py +++ b/src/sec_certs/dataset/cc.py @@ -63,7 +63,7 @@ class CCDataset(Dataset[CCCertificate], ComplexSerializableType): │ │ ├── pps │ │ │ ├── pdf │ │ │ └── txt - │ │ └── pp.json + │ │ └── dataset.json │ └── maintenances │ ├── certs │ │ ├── reports diff --git a/src/sec_certs/dataset/dataset.py b/src/sec_certs/dataset/dataset.py index 7a9c92ed..be070580 100644 --- a/src/sec_certs/dataset/dataset.py +++ b/src/sec_certs/dataset/dataset.py @@ -169,7 +169,7 @@ class Dataset(Generic[CertSubType], ComplexSerializableType, ABC): if not snapshot_url: snapshot_url = cls.SNAPSHOT_URL if not progress_bar_desc: - progress_bar_desc = f"Downloading: {type(cls).__name__}" + progress_bar_desc = f"Downloading: {cls.__name__}" if (artifacts or auxiliary_datasets) and path is None: raise ValueError("Path needs to be defined if artifacts or auxiliary datasets are to be downloaded.") diff --git a/src/sec_certs/dataset/protection_profile.py b/src/sec_certs/dataset/protection_profile.py index 2295191a..9b22ca75 100644 --- a/src/sec_certs/dataset/protection_profile.py +++ b/src/sec_certs/dataset/protection_profile.py @@ -31,7 +31,7 @@ class ProtectionProfileDataset(Dataset[ProtectionProfile], ComplexSerializableTy ├── pps │ ├── pdf │ └── txt - └── pp.json + └── dataset.json """ FULL_ARCHIVE_URL: ClassVar[AnyHttpUrl] = config.pp_latest_full_archive @@ -57,7 +57,7 @@ class ProtectionProfileDataset(Dataset[ProtectionProfile], ComplexSerializableTy @property def json_path(self) -> Path: - return self.root_dir / "pp.json" + return self.root_dir / "dataset.json" @property def reports_dir(self) -> Path: |