From 8dc06f4c7e91c16cf849e3eb8ffd274b38393cb9 Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 20 Jun 2024 14:42:28 +0200 Subject: Fix FIPS pipeline for new certs. Fixes #SECCERTS-1GT. --- src/sec_certs/sample/fips.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sec_certs/sample/fips.py b/src/sec_certs/sample/fips.py index cee8cb9d..ce2e6907 100644 --- a/src/sec_certs/sample/fips.py +++ b/src/sec_certs/sample/fips.py @@ -459,7 +459,7 @@ class FIPSCertificate( def alg_to_number(alg: str) -> str: return "".join([x for x in alg.split("#")[1] if x.isdigit()]) - return {alg_to_number(x) for x in self.algorithms} + return {alg_to_number(x) for x in self.algorithms if "#" in x} @property def dgst(self) -> str: -- cgit v1.3.1 From 6eb3aa156815db688142f9ba86a301a7547bfe4a Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 20 Jun 2024 14:45:42 +0200 Subject: Fix typing issue. --- src/sec_certs/model/references_nlp/annotator.py | 2 +- src/sec_certs/utils/pandas.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sec_certs/model/references_nlp/annotator.py b/src/sec_certs/model/references_nlp/annotator.py index 1cc816f5..dab6665f 100644 --- a/src/sec_certs/model/references_nlp/annotator.py +++ b/src/sec_certs/model/references_nlp/annotator.py @@ -96,6 +96,6 @@ class ReferenceAnnotator: df_new["y_proba"] = y_proba df_new["y_pred"] = self.predict(df_new.segments) df_new["correct"] = df_new.apply( - lambda row: row["y_pred"] == row["label"] if not pd.isnull(row["label"]) else np.NaN, axis=1 + lambda row: row["y_pred"] == row["label"] if not pd.isnull(row["label"]) else np.nan, axis=1 ) return df_new diff --git a/src/sec_certs/utils/pandas.py b/src/sec_certs/utils/pandas.py index 661b669c..890cce99 100644 --- a/src/sec_certs/utils/pandas.py +++ b/src/sec_certs/utils/pandas.py @@ -173,7 +173,7 @@ def compute_cve_correlations( spearmanr = functools.partial(stats.spearmanr, nan_policy="omit", alternative="less") df_sar.eal = df_sar.eal.cat.codes - df_sar.eal = df_sar.eal.map(lambda x: np.NaN if x == -1 else x) + df_sar.eal = df_sar.eal.map(lambda x: np.nan if x == -1 else x) n_cves_eal_corr, n_cves_eal_pvalue = spearmanr(df_sar.eal, df_sar.n_cves) n_cves_corrs = [n_cves_eal_corr] -- cgit v1.3.1 From c8516a607a08d848c8adcec7914d065488c52911 Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 20 Jun 2024 14:55:12 +0200 Subject: Bump setup-python action in CI, use caching. --- .github/workflows/docs.yml | 5 ++++- .github/workflows/pre-commit.yml | 5 ++++- .github/workflows/release.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6de98b07..2af0f6f0 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,9 +11,12 @@ jobs: - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" + cache: "pip" + cache-dependency-path: | + requirements/dev_requirements.txt - name: apt-get update run: sudo apt-get update - name: Install external dependencies diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 6855dc63..9332545f 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -7,9 +7,12 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: "3.10" + cache: "pip" + cache-dependency-path: | + requirements/dev_requirements.txt - name: apt-get update run: sudo apt-get update - name: Install dependencies diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9fed59f7..7921456f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" - name: apt-get update diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a8ae7d6c..5b3353fa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,7 +17,7 @@ jobs: run: sudo apt-get install -y build-essential libpoppler-cpp-dev pkg-config python3-dev - uses: actions/checkout@v4 - name: Setup python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: "3.10" cache: "pip" -- cgit v1.3.1 From 3c0392f60033a9fd8b33f48891c2b48ec8a791b0 Mon Sep 17 00:00:00 2001 From: J08nY Date: Thu, 20 Jun 2024 14:58:07 +0200 Subject: Use pre-commit action in CI. Uses caching, should be better. --- .github/workflows/pre-commit.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 9332545f..3e93bc7d 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,14 +10,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.10" - cache: "pip" - cache-dependency-path: | - requirements/dev_requirements.txt - - name: apt-get update - run: sudo apt-get update - - name: Install dependencies - run: | - sudo apt-get install build-essential libpoppler-cpp-dev pkg-config python3-dev -y - pip install -r requirements/dev_requirements.txt - - name: Run pre-commit - run: pre-commit run --all-files + - uses: pre-commit/action@v3.0.1 + with: + extra_args: --all-files -- cgit v1.3.1