Skip to content

chore(deps): bump score_persistency pin, drop obsolete patches #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
antonkri wants to merge 1 commit into from
Closed

chore(deps): bump score_persistency pin, drop obsolete patches #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions bazel_common/score_modules_target_sw.MODULE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,12 @@ git_override(
bazel_dep(name = "score_persistency")
git_override(
module_name = "score_persistency",
commit = "9ae529ba9f413976ff5c9948c6490afa51bbfdc3",
commit = "d2b65ed28aa851f963f623bb5d40a010a48bff77",
patch_strip = 1,
patches = [
"//patches/persistency:001-add-mod-need.patch",
"//patches/persistency:002-rename-manual-verification-report-id.patch",
"//patches/persistency:003-pip-not-dev-dependency.patch",
"//patches/persistency:004-imagefs-not-dev-dependency.patch",
"//patches/persistency:005-googletest-not-dev-dependency.patch",
"//patches/persistency:006-add-module-index-title.patch",
],
remote = "https://github.com/eclipse-score/persistency.git",
)
Expand Down
4 changes: 2 additions & 2 deletions docs/verification_report/modules/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ respective module's own needs data using the module verification report
template introduced by docs-as-code.

* :doc:`Baselibs <baselibs/baselibs_verification_report>`
* :doc:`Persistency <persistency/persistency_verification_report>`
* :doc:`Persistency </modules/score_persistency/verification_report/module_verification_report>`

.. toctree::
:titlesonly:
:hidden:

Baselibs <baselibs/baselibs_verification_report>
Persistency <persistency/persistency_verification_report>
Persistency </modules/score_persistency/verification_report/module_verification_report>
31 changes: 0 additions & 31 deletions docs/verification_report/modules/persistency/persistency_verification_report.rst
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions known_good.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,9 @@
"score_persistency": {
"repo": "https://github.com/eclipse-score/persistency.git",
"bazel_patches": [
"//patches/persistency:001-add-mod-need.patch",
"//patches/persistency:002-rename-manual-verification-report-id.patch",
"//patches/persistency:003-pip-not-dev-dependency.patch",
"//patches/persistency:004-imagefs-not-dev-dependency.patch",
"//patches/persistency:005-googletest-not-dev-dependency.patch",
"//patches/persistency:006-add-module-index-title.patch"
"//patches/persistency:005-googletest-not-dev-dependency.patch"
],
"metadata": {
"code_root_path": "//score/kvs/...",
Expand All @@ -89,7 +86,7 @@
],
"rust_coverage_config": "ferrocene-coverage-per"
},
"hash": "9ae529ba9f413976ff5c9948c6490afa51bbfdc3"
"hash": "d2b65ed28aa851f963f623bb5d40a010a48bff77"
},
"score_kyron": {
"repo": "https://github.com/eclipse-score/kyron.git",
Expand Down
37 changes: 0 additions & 37 deletions patches/persistency/001-add-mod-need.patch
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions patches/persistency/002-rename-manual-verification-report-id.patch
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions patches/persistency/003-pip-not-dev-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -53,10 +53,10 @@ python.toolchain(
@@ -50,13 +50,13 @@ python.toolchain(
python_version = PYTHON_VERSION,
)

Expand All @@ -15,15 +15,18 @@ diff --git a/MODULE.bazel b/MODULE.bazel
)
-use_repo(pip, "pip_score_venv_test")
+use_repo(pip, "pip_score_persistency_venv_test")

# C++ toolchain configuration
gcc = use_extension("@score_bazel_cpp_toolchains//extensions:gcc.bzl", "gcc", dev_dependency = True)
diff --git a/score/kvs/tests/test_cases/BUILD b/score/kvs/tests/test_cases/BUILD
--- a/score/kvs/tests/test_cases/BUILD
+++ b/score/kvs/tests/test_cases/BUILD
@@ -9,7 +9,7 @@
# https://www.apache.org/licenses/LICENSE-2.0
@@ -10,7 +10,7 @@
#
# SPDX-License-Identifier: Apache-2.0
# *******************************************************************************
-load("@pip_score_venv_test//:requirements.bzl", "all_requirements")
+load("@pip_score_persistency_venv_test//:requirements.bzl", "all_requirements")
load("@rules_python//python:pip.bzl", "compile_pip_requirements")
load("@score_tooling//python_basics:defs.bzl", "score_py_pytest", "score_virtualenv")

12 changes: 6 additions & 6 deletions patches/persistency/004-imagefs-not-dev-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -37,7 +37,7 @@ bazel_dep(name = "aspect_rules_lint", version = "2.7.2", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = True)
@@ -37,7 +37,7 @@ bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = Tr
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)
bazel_dep(name = "googletest", version = "1.18.0", dev_dependency = True)
bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.1", dev_dependency = True)
-bazel_dep(name = "score_rules_imagefs", version = "0.0.4", dev_dependency = True)
+bazel_dep(name = "score_rules_imagefs", version = "0.0.4")
bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True)
-bazel_dep(name = "score_rules_imagefs", version = "0.1.0", dev_dependency = True)
+bazel_dep(name = "score_rules_imagefs", version = "0.1.0")
bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True)
bazel_dep(name = "score_toolchains_rust", version = "0.10.0", dev_dependency = True)

10 changes: 5 additions & 5 deletions patches/persistency/005-googletest-not-dev-dependency.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
diff --git a/MODULE.bazel b/MODULE.bazel
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -38,7 +38,7 @@ bazel_dep(name = "score_tooling", version = "2.2.0")
@@ -35,7 +35,7 @@ bazel_dep(name = "score_tooling", version = "2.2.0")
bazel_dep(name = "aspect_rules_lint", version = "2.7.2", dev_dependency = True)
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.3", dev_dependency = True)
bazel_dep(name = "google_benchmark", version = "1.9.5", dev_dependency = True)
-bazel_dep(name = "googletest", version = "1.18.0", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.18.0")
bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.1", dev_dependency = True)
bazel_dep(name = "score_rules_imagefs", version = "0.0.4")
-bazel_dep(name = "googletest", version = "1.17.0.bcr.2", dev_dependency = True)
+bazel_dep(name = "googletest", version = "1.17.0.bcr.2")
bazel_dep(name = "score_bazel_cpp_toolchains", version = "1.0.3", dev_dependency = True)
bazel_dep(name = "score_rules_imagefs", version = "0.1.0")
bazel_dep(name = "score_rust_policies", version = "0.0.5", dev_dependency = True)
14 changes: 0 additions & 14 deletions patches/persistency/006-add-module-index-title.patch
View file
Open in desktop

This file was deleted.

Loading