You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by tv...@apache.org on 2022/01/14 02:15:09 UTC
[buildstream] branch tristan/fix-cache-key-test created (now 1741ea8)
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a change to branch tristan/fix-cache-key-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
at 1741ea8 tests/cachekey: Updated for the recent SOURCE_DATE_EPOCH change.
This branch includes the following new commits:
new 4ab6933 plugins/sources/pip.py: Whitelist python 3.9 as a valid version
new 82a8290 testing/_update_cachekeys.py: Fixed to actually work.
new 1741ea8 tests/cachekey: Updated for the recent SOURCE_DATE_EPOCH change.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[buildstream] 02/03: testing/_update_cachekeys.py: Fixed to actually work.
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/fix-cache-key-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 82a82907a13e7b20e31554ec1735baa7de999f3b
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Fri Jan 14 11:11:40 2022 +0900
testing/_update_cachekeys.py: Fixed to actually work.
At some point we changed Cli() to create it's directory in order to simplify
some code, but we didn't update this file which directly uses Cli().
---
src/buildstream/testing/_update_cachekeys.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/buildstream/testing/_update_cachekeys.py b/src/buildstream/testing/_update_cachekeys.py
index 38ac755..232445a 100755
--- a/src/buildstream/testing/_update_cachekeys.py
+++ b/src/buildstream/testing/_update_cachekeys.py
@@ -45,8 +45,10 @@ def update_keys():
project_dir = os.getcwd()
with tempfile.TemporaryDirectory(dir=project_dir) as cache_dir:
+ directory = os.path.join(str(cache_dir), "cache")
+
# Run bst show
- cli = Cli(cache_dir, verbose=True)
+ cli = Cli(directory, verbose=True)
result = cli.run(
project=project_dir, silent=True, args=["--no-colors", "show", "--format", "%{name}::%{full-key}"],
)
[buildstream] 01/03: plugins/sources/pip.py: Whitelist python 3.9 as a valid version
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/fix-cache-key-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 4ab6933e1271884018cae356553eeccd5595c194
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Fri Jan 14 11:11:19 2022 +0900
plugins/sources/pip.py: Whitelist python 3.9 as a valid version
---
src/buildstream/plugins/sources/pip.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/buildstream/plugins/sources/pip.py b/src/buildstream/plugins/sources/pip.py
index fa36209..bb81647 100644
--- a/src/buildstream/plugins/sources/pip.py
+++ b/src/buildstream/plugins/sources/pip.py
@@ -85,6 +85,7 @@ _PYTHON_VERSIONS = [
"python3.6",
"python3.7",
"python3.8",
+ "python3.9",
]
# List of allowed extensions taken from
[buildstream] 03/03: tests/cachekey: Updated for the recent SOURCE_DATE_EPOCH change.
Posted by tv...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tvb pushed a commit to branch tristan/fix-cache-key-test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 1741ea81f98008e178cfff7307e5f5f74653ce9c
Author: Tristan van Berkom <tr...@codethink.co.uk>
AuthorDate: Fri Jan 14 11:12:39 2022 +0900
tests/cachekey: Updated for the recent SOURCE_DATE_EPOCH change.
---
tests/cachekey/project/elements/build1.expected | 2 +-
tests/cachekey/project/elements/build2.expected | 2 +-
tests/cachekey/project/elements/build3.expected | 2 +-
tests/cachekey/project/elements/compose1.expected | 2 +-
tests/cachekey/project/elements/compose2.expected | 2 +-
tests/cachekey/project/elements/compose3.expected | 2 +-
tests/cachekey/project/elements/compose4.expected | 2 +-
tests/cachekey/project/elements/compose5.expected | 2 +-
tests/cachekey/project/elements/import1.expected | 2 +-
tests/cachekey/project/elements/import2.expected | 2 +-
tests/cachekey/project/elements/import3.expected | 2 +-
tests/cachekey/project/elements/script1.expected | 2 +-
tests/cachekey/project/sources/bzr1.expected | 2 +-
tests/cachekey/project/sources/git1.expected | 2 +-
tests/cachekey/project/sources/git2.expected | 2 +-
tests/cachekey/project/sources/git3.expected | 2 +-
tests/cachekey/project/sources/local1.expected | 2 +-
tests/cachekey/project/sources/local2.expected | 2 +-
tests/cachekey/project/sources/patch1.expected | 2 +-
tests/cachekey/project/sources/patch2.expected | 2 +-
tests/cachekey/project/sources/patch3.expected | 2 +-
tests/cachekey/project/sources/pip1.expected | 2 +-
tests/cachekey/project/sources/remote1.expected | 2 +-
tests/cachekey/project/sources/remote2.expected | 2 +-
tests/cachekey/project/sources/tar1.expected | 2 +-
tests/cachekey/project/sources/tar2.expected | 2 +-
tests/cachekey/project/sources/zip1.expected | 2 +-
tests/cachekey/project/sources/zip2.expected | 2 +-
tests/cachekey/project/target.expected | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected
index 1692f54..f9e425c 100644
--- a/tests/cachekey/project/elements/build1.expected
+++ b/tests/cachekey/project/elements/build1.expected
@@ -1 +1 @@
-a31f513b77c99f40444f60a9cf95b2b127b2fc6f11074eab952e442002eaac1f
\ No newline at end of file
+df973166242fc7613903e09b39f8c44990868af0554421ee7c1beaf9fc268030
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected
index ab5a9aa..9f0a4d2 100644
--- a/tests/cachekey/project/elements/build2.expected
+++ b/tests/cachekey/project/elements/build2.expected
@@ -1 +1 @@
-7edfaf2fe00b46d7e92808f666df37f04834b51b8672fb898a0e041be9080c96
\ No newline at end of file
+0d3d9cb2c3d8569806f4822a2bd52150a675d4621883b35e02f266cfc10bc457
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/build3.expected b/tests/cachekey/project/elements/build3.expected
index 01f7bb1..fd339a4 100644
--- a/tests/cachekey/project/elements/build3.expected
+++ b/tests/cachekey/project/elements/build3.expected
@@ -1 +1 @@
-1792a11e64ee1a5c981ead2f7a4a05695b503d700ce6d3e50c8373a1f08e1210
\ No newline at end of file
+8fbfdfed830260389b941583dcde6533202a3e970063aa6569dfd1b4dd303356
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose1.expected b/tests/cachekey/project/elements/compose1.expected
index 65078c9..fd88e67 100644
--- a/tests/cachekey/project/elements/compose1.expected
+++ b/tests/cachekey/project/elements/compose1.expected
@@ -1 +1 @@
-51e162d4f09e7b0f47f709ccd0bf0084fd6cface26bbbad484869fc49df6e5ec
\ No newline at end of file
+f3eb266781b7cea1230d5def8f49d21312ae98e2156b77ff429690ebefcf6d5a
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose2.expected b/tests/cachekey/project/elements/compose2.expected
index f128418..d979a89 100644
--- a/tests/cachekey/project/elements/compose2.expected
+++ b/tests/cachekey/project/elements/compose2.expected
@@ -1 +1 @@
-b95eee0297a2d8ffd11f9c351a9a5a9b4243d806df4734b39100207044b91a0e
\ No newline at end of file
+827b5de4a4cc7cb2a0738d792287af56ca95e29da75aea5c7674cb6fa9d06b70
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose3.expected b/tests/cachekey/project/elements/compose3.expected
index c5009c4..291e94c 100644
--- a/tests/cachekey/project/elements/compose3.expected
+++ b/tests/cachekey/project/elements/compose3.expected
@@ -1 +1 @@
-0774629ece7ea4e21bddf47fa7fabc2ff5efa4dcc58509006f8fdc96d7d1c900
\ No newline at end of file
+82e9499af43b8ce933e61b2b93f342930616ac06f2288ea8b00c9245935beb67
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose4.expected b/tests/cachekey/project/elements/compose4.expected
index a70f707..388fe77 100644
--- a/tests/cachekey/project/elements/compose4.expected
+++ b/tests/cachekey/project/elements/compose4.expected
@@ -1 +1 @@
-0d31c6742239b4eed81ea89a2fe4dd66bb327794641f58c62b76b0f93f07d22e
\ No newline at end of file
+77ff7b5a2286bce2dbe2b6bb7e98908d709c5b00450af5c8e9221eccd481eae2
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/compose5.expected b/tests/cachekey/project/elements/compose5.expected
index 04c3960..d7625b0 100644
--- a/tests/cachekey/project/elements/compose5.expected
+++ b/tests/cachekey/project/elements/compose5.expected
@@ -1 +1 @@
-c1f03c1b1b4bf0141f9014ffe527758c36721ec0fe3d87abd1ec700e2da3e891
\ No newline at end of file
+6239ae1b6b33c6bdb3b25198c2d4a43d0c77dd7d95f540a42e139188a074dcfd
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import1.expected b/tests/cachekey/project/elements/import1.expected
index 10ebbda..5f013e6 100644
--- a/tests/cachekey/project/elements/import1.expected
+++ b/tests/cachekey/project/elements/import1.expected
@@ -1 +1 @@
-92d3ad5fa90c754fa63ee93a3b6fcf383c1b447cf37628d571054e52a2df50c2
\ No newline at end of file
+2e13c26448868c7c30cf7e4549627d757cadab2901d578f40acdd17aaa535816
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import2.expected b/tests/cachekey/project/elements/import2.expected
index 8416eb2..0ed5739 100644
--- a/tests/cachekey/project/elements/import2.expected
+++ b/tests/cachekey/project/elements/import2.expected
@@ -1 +1 @@
-9104a767449b0a7d9c2bbe341548f3bea6c4ef6556059b3b6b1869909b372f88
\ No newline at end of file
+4b2a646a93b955392449d8e9c4dcb121e52e1698a11859d90df12d08da8a4564
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/import3.expected b/tests/cachekey/project/elements/import3.expected
index a4ccd52..f071fe2 100644
--- a/tests/cachekey/project/elements/import3.expected
+++ b/tests/cachekey/project/elements/import3.expected
@@ -1 +1 @@
-ba652fcab4d8ac7fe2e1930768b80e5494b0d5ca0c25a5f713070b5431134709
\ No newline at end of file
+71b8113e587bb9e6549bd95b71dac7b5d2c7d7d2de59f3f27c247fec860a55b5
\ No newline at end of file
diff --git a/tests/cachekey/project/elements/script1.expected b/tests/cachekey/project/elements/script1.expected
index b817085..f7d213b 100644
--- a/tests/cachekey/project/elements/script1.expected
+++ b/tests/cachekey/project/elements/script1.expected
@@ -1 +1 @@
-73d09c3efcb2a2787737b3fc33fd6eefd0635fe3b26fda59ca3d43e5c39f9028
\ No newline at end of file
+4b5a4267ba32fca936acf7212213e03c5a6f0448f66444f54009243b5425ca3c
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/bzr1.expected b/tests/cachekey/project/sources/bzr1.expected
index 36db84e..3a344db 100644
--- a/tests/cachekey/project/sources/bzr1.expected
+++ b/tests/cachekey/project/sources/bzr1.expected
@@ -1 +1 @@
-61809980b80872ace2a83b5d16b698b6526002d2364adccc2836e8f75d2c5b88
\ No newline at end of file
+a19ed9f67c1106b3af0e43dd2e4485b7cc0ef40a26c39f76ae102a2791dac0b0
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git1.expected b/tests/cachekey/project/sources/git1.expected
index f5f3227..66594a0 100644
--- a/tests/cachekey/project/sources/git1.expected
+++ b/tests/cachekey/project/sources/git1.expected
@@ -1 +1 @@
-5ff9575c5ecfb760e2a683fe88361ee55314b854a70e338a5caba55dbe8c57d9
\ No newline at end of file
+d554f77e28b68c4085603e67dc3db69bdedb7284efceee60f7bb3f93d3e3c714
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git2.expected b/tests/cachekey/project/sources/git2.expected
index 414d8a3..e14d973 100644
--- a/tests/cachekey/project/sources/git2.expected
+++ b/tests/cachekey/project/sources/git2.expected
@@ -1 +1 @@
-2ba0fedf30942a4641a51f7ad5e5bcd38732e3ea798afe64fe37aa1a0b6ce532
\ No newline at end of file
+0f1edc1e24b9c517ad6645d922904b7738f01f405050f6f42edc7670ba528b18
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/git3.expected b/tests/cachekey/project/sources/git3.expected
index 31d262f..519fb82 100644
--- a/tests/cachekey/project/sources/git3.expected
+++ b/tests/cachekey/project/sources/git3.expected
@@ -1 +1 @@
-7ef53f28840b94a86d34eab03e2a1c9f6e607cc36527844de5dde44ee7d3aa82
\ No newline at end of file
+6e408beca9d70e603620e6c91cd03a2ec753d8cb9b824edbd34916db9f95068c
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local1.expected b/tests/cachekey/project/sources/local1.expected
index cddb0f3..3e6587d 100644
--- a/tests/cachekey/project/sources/local1.expected
+++ b/tests/cachekey/project/sources/local1.expected
@@ -1 +1 @@
-3ddeb2984e64c885cfc03e09be4d0efdb665250fd1d8a7ebbec7aa847e74055e
\ No newline at end of file
+211d6e6c98a1d7d9bc2f17f700b6909a0a7158cb1b4775bb17f860d4e1b60ca0
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/local2.expected b/tests/cachekey/project/sources/local2.expected
index 7983c7c..d47049c 100644
--- a/tests/cachekey/project/sources/local2.expected
+++ b/tests/cachekey/project/sources/local2.expected
@@ -1 +1 @@
-ef2801ff5349d5d2c319fbda60e19e23f6b92cee10c7449f6e0c2c503cb955cc
\ No newline at end of file
+1cf8601dade7f3bc11087f23bf5719643dafb75f962e9164ed21717b26fca62f
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch1.expected b/tests/cachekey/project/sources/patch1.expected
index 709c36d..4a2d62a 100644
--- a/tests/cachekey/project/sources/patch1.expected
+++ b/tests/cachekey/project/sources/patch1.expected
@@ -1 +1 @@
-d02dfb7fd25c7a3bbdc99f72f990baea14c0075233e40b6e8907e150b0d6d2bf
\ No newline at end of file
+7143d93a643dedbf59a54c553931f7dac9f218dd50ca8e3c185aa88564fde79e
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch2.expected b/tests/cachekey/project/sources/patch2.expected
index a52ef5a..1042a8e 100644
--- a/tests/cachekey/project/sources/patch2.expected
+++ b/tests/cachekey/project/sources/patch2.expected
@@ -1 +1 @@
-3ca9a6fdff99300db164b892fb7e592d7e75ac548f70c9aaef7cd86542702639
\ No newline at end of file
+63af94694153292f5adababaeb8e0efecadcb03352508dc38aa0f8d6081c4507
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/patch3.expected b/tests/cachekey/project/sources/patch3.expected
index 55d9517..fd09267 100644
--- a/tests/cachekey/project/sources/patch3.expected
+++ b/tests/cachekey/project/sources/patch3.expected
@@ -1 +1 @@
-32855fe6027fb27cdf71251d6c3022866de602b1377aa8c99613120db3bb7427
\ No newline at end of file
+8f025f16146c9ce5f57054c20916a7a4af5289eeb2fe901888774bbccb6e626f
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/pip1.expected b/tests/cachekey/project/sources/pip1.expected
index 5dd2317..3a9889e 100644
--- a/tests/cachekey/project/sources/pip1.expected
+++ b/tests/cachekey/project/sources/pip1.expected
@@ -1 +1 @@
-0399ffb1d3430b59af6f75ef2f663ba93bace7dd5204aea9a314b7b6fe656aa5
\ No newline at end of file
+b33718cc3ccda4ae18c3979b093936998d7c048a1b645ee2b19d275ccee7fb59
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote1.expected b/tests/cachekey/project/sources/remote1.expected
index 2cbb432..1f07525 100644
--- a/tests/cachekey/project/sources/remote1.expected
+++ b/tests/cachekey/project/sources/remote1.expected
@@ -1 +1 @@
-c685ece0668aebe63b5605849942e40593a2dc143c42e742f660253908539def
\ No newline at end of file
+af552654eb85d83844bc96ef9b2392f526bf3256f5563b0aef836833d0237b92
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/remote2.expected b/tests/cachekey/project/sources/remote2.expected
index ae1af22..b840ab7 100644
--- a/tests/cachekey/project/sources/remote2.expected
+++ b/tests/cachekey/project/sources/remote2.expected
@@ -1 +1 @@
-745a7073f383cb486ff7667b5d326a7fa02e8025942f802f17cd60f381dd849b
\ No newline at end of file
+783302e483f9ebf95ee18f968caccdb679177edacceb832d81867e5a7ecc130d
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar1.expected b/tests/cachekey/project/sources/tar1.expected
index 0e0d249..83df577 100644
--- a/tests/cachekey/project/sources/tar1.expected
+++ b/tests/cachekey/project/sources/tar1.expected
@@ -1 +1 @@
-1e132d0b4c54416f6a1bf39a7214b6c12a6929104075ab2976d706fc8dec7a5f
\ No newline at end of file
+8e5561d64565aeab717e86f157242d209d50dfdcb7ec56a0b8c4896c503b02b3
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/tar2.expected b/tests/cachekey/project/sources/tar2.expected
index dcafbbf..2ebf08f 100644
--- a/tests/cachekey/project/sources/tar2.expected
+++ b/tests/cachekey/project/sources/tar2.expected
@@ -1 +1 @@
-89b7b576615887651a316abac300b02ea242c581643426d34ad9afb1eab435b4
\ No newline at end of file
+baef1d30d83128da0244d404a131191a4dcc3800935e588944b1e20fd0be62d5
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip1.expected b/tests/cachekey/project/sources/zip1.expected
index ac3d09f..3df32b0 100644
--- a/tests/cachekey/project/sources/zip1.expected
+++ b/tests/cachekey/project/sources/zip1.expected
@@ -1 +1 @@
-462801e978cf3cc6f69a403ae033a7e4bd8a05cf5d7be357c9f91f03af1edbed
\ No newline at end of file
+f075ed6e5aba4137398b9a2c02a0c577bd94f65d81f819c3a9aeb5648df81d34
\ No newline at end of file
diff --git a/tests/cachekey/project/sources/zip2.expected b/tests/cachekey/project/sources/zip2.expected
index 4f35a72..801d724 100644
--- a/tests/cachekey/project/sources/zip2.expected
+++ b/tests/cachekey/project/sources/zip2.expected
@@ -1 +1 @@
-828994c07f34eb468456b038744e41422ef53d30a047a4335e32e9d62218f291
\ No newline at end of file
+ad6be2e06d48d403d80d8fef2cea47f0e55e30e1b15ee44c960c5efeecd2bf0c
\ No newline at end of file
diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected
index 3fa0aea..1c169e8 100644
--- a/tests/cachekey/project/target.expected
+++ b/tests/cachekey/project/target.expected
@@ -1 +1 @@
-788da21e7c1b5818b7e7b60f7eb75841057ff7e45d362cc223336c606fe47f27
\ No newline at end of file
+a26c258774df481d0a8d6919eaa90fd4cf3c3a55b84dce5216d57f80886b101a
\ No newline at end of file