From ee4411c36eb630f4330fd32aeb26fe472fe9b47f Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Tue, 23 Apr 2024 05:15:56 +0000 Subject: [PATCH 1/7] py3-ml-metadata/1.15.0 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- py3-ml-metadata.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index 7e973e5af09..a9e0aa0a461 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -1,7 +1,7 @@ package: name: py3-ml-metadata - version: 1.14.0 - epoch: 3 + version: 1.15.0 + epoch: 0 description: For recording and retrieving metadata associated with ML developer and data scientist workflows. copyright: - license: MIT @@ -32,7 +32,7 @@ pipeline: with: repository: https://github.com/google/ml-metadata tag: v${{package.version}} - expected-commit: 4893bf12d763278a05867b61a47a478ed1286289 + expected-commit: abcb0705e71ccb71d064ad3d7ba6bdea5645cf91 - uses: patch with: From 9275de95a6955aa24a55540714b629a8d5ff7b80 Mon Sep 17 00:00:00 2001 From: Ajay Kemparaj Date: Tue, 23 Apr 2024 12:23:27 +0530 Subject: [PATCH 2/7] Update py3-ml-metadata.yaml --- py3-ml-metadata.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index a9e0aa0a461..a1cd0bf88dd 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -34,10 +34,6 @@ pipeline: tag: v${{package.version}} expected-commit: abcb0705e71ccb71d064ad3d7ba6bdea5645cf91 - - uses: patch - with: - series: series - - runs: | python3 setup.py build From 950b08cbb88b8bde4c862ffaba915920eb2971ba Mon Sep 17 00:00:00 2001 From: Ajay Kemparaj Date: Tue, 23 Apr 2024 12:51:15 +0530 Subject: [PATCH 3/7] Update py3-ml-metadata.yaml --- py3-ml-metadata.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index a1cd0bf88dd..4bd1626d2db 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -13,7 +13,7 @@ environment: contents: packages: - bash - - bazel-5 + - bazel-6 - build-base - busybox - ca-certificates-bundle From 1cd44aa78b439a148fab5aeb049fd8c770f5d083 Mon Sep 17 00:00:00 2001 From: ajayk Date: Tue, 23 Apr 2024 16:04:25 +0530 Subject: [PATCH 4/7] add patches back --- py3-ml-metadata.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index 4bd1626d2db..bc5523900bf 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -34,6 +34,10 @@ pipeline: tag: v${{package.version}} expected-commit: abcb0705e71ccb71d064ad3d7ba6bdea5645cf91 + - uses: patch + with: + series: series + - runs: | python3 setup.py build From d48d1fbd8d39dfb8fd28b4bcc6cffb488643b166 Mon Sep 17 00:00:00 2001 From: user Date: Tue, 14 May 2024 14:30:02 +0000 Subject: [PATCH 5/7] remove patch Signed-off-by: user --- py3-ml-metadata/series | 1 - 1 file changed, 1 deletion(-) diff --git a/py3-ml-metadata/series b/py3-ml-metadata/series index ca93c576c66..0b4d2a4fe03 100644 --- a/py3-ml-metadata/series +++ b/py3-ml-metadata/series @@ -1,3 +1,2 @@ -0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch 0002-add-zetasql-hackfix.patch 0003-postgresql-BUILD-disable-x86-64-specific-optimizatio.patch From e21efa56c5c3ed0b5ad7aaf556dd9f97f18436f0 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Date: Fri, 17 May 2024 09:51:25 -0600 Subject: [PATCH 6/7] temporarily change to bazelisk for testing Signed-off-by: Sergio Gonzalez --- py3-ml-metadata.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index bc5523900bf..518850db85a 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -13,7 +13,8 @@ environment: contents: packages: - bash - - bazel-6 + - bazelisk + - bazelisk-default - build-base - busybox - ca-certificates-bundle From 0330ea317edc44b293b0ac134730040ea06c9519 Mon Sep 17 00:00:00 2001 From: James Rawlings Date: Wed, 22 May 2024 21:42:09 +0100 Subject: [PATCH 7/7] py3-ml-medata: fix build, we need to regenerate the bazel dependency version update patches Signed-off-by: James Rawlings --- py3-ml-metadata.yaml | 3 +-- ...ingssl-six-rules-foreign-cc-versions.patch | 23 ++++++++----------- py3-ml-metadata/series | 3 ++- 3 files changed, 13 insertions(+), 16 deletions(-) diff --git a/py3-ml-metadata.yaml b/py3-ml-metadata.yaml index 518850db85a..bc5523900bf 100644 --- a/py3-ml-metadata.yaml +++ b/py3-ml-metadata.yaml @@ -13,8 +13,7 @@ environment: contents: packages: - bash - - bazelisk - - bazelisk-default + - bazel-6 - build-base - busybox - ca-certificates-bundle diff --git a/py3-ml-metadata/0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch b/py3-ml-metadata/0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch index 01f796fe26e..a8302a39db1 100644 --- a/py3-ml-metadata/0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch +++ b/py3-ml-metadata/0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch @@ -1,8 +1,8 @@ diff --git a/WORKSPACE b/WORKSPACE -index 5c094e9..18d0579 100644 +index 2465151..b5f6a38 100644 --- a/WORKSPACE +++ b/WORKSPACE -@@ -24,18 +24,18 @@ http_archive( +@@ -24,18 +24,16 @@ http_archive( sha256 = "5308fc1d8865406a49427ba24a9ab53087f17f5266a7aabbfc28823f3916e1ca", ) @@ -21,12 +21,10 @@ index 5c094e9..18d0579 100644 url = "https://github.com/bazelbuild/rules_foreign_cc/archive/refs/tags/%s.tar.gz" % RULES_FOREIGN_CC_VERSION, - patch_tool = "patch", - patches = ["//ml_metadata/third_party:rules_foreign_cc.patch",], -+ #patch_tool = "patch", -+ #patches = ["//ml_metadata/third_party:rules_foreign_cc.patch",], ) load("@rules_foreign_cc//foreign_cc:repositories.bzl", "rules_foreign_cc_dependencies") -@@ -43,17 +43,17 @@ rules_foreign_cc_dependencies() +@@ -43,17 +41,17 @@ rules_foreign_cc_dependencies() http_archive( name = "com_google_absl", @@ -50,7 +48,7 @@ index 5c094e9..18d0579 100644 ], ) -@@ -99,11 +99,10 @@ http_archive( +@@ -98,11 +96,10 @@ http_archive( http_archive( name = "six_archive", urls = [ @@ -65,12 +63,11 @@ index 5c094e9..18d0579 100644 build_file = "//ml_metadata/third_party:six.BUILD" ) -@@ -254,7 +253,8 @@ http_archive( # windows - name = "com_google_zetasql", # windows - urls = ["https://github.com/google/zetasql/archive/%s.zip" % ZETASQL_COMMIT], # windows - strip_prefix = "zetasql-%s" % ZETASQL_COMMIT, # windows -- #patches = ["//ml_metadata/third_party:zetasql.patch"], # windows +@@ -253,6 +250,8 @@ http_archive( + urls = ["https://github.com/google/zetasql/archive/%s.zip" % ZETASQL_COMMIT], + strip_prefix = "zetasql-%s" % ZETASQL_COMMIT, + #patches = ["//ml_metadata/third_party:zetasql.patch"], + patch_tool = "patch", # windows + patches = ["//ml_metadata/third_party:zetasql-m4-1.4.19.patch"], # windows - sha256 = '651a768cd51627f58aa6de7039aba9ddab22f4b0450521169800555269447840' # windows - ) # windows + sha256 = '651a768cd51627f58aa6de7039aba9ddab22f4b0450521169800555269447840' + ) \ No newline at end of file diff --git a/py3-ml-metadata/series b/py3-ml-metadata/series index 0b4d2a4fe03..76f7c478e41 100644 --- a/py3-ml-metadata/series +++ b/py3-ml-metadata/series @@ -1,2 +1,3 @@ +0001-bump-abseil-boringssl-six-rules-foreign-cc-versions.patch 0002-add-zetasql-hackfix.patch -0003-postgresql-BUILD-disable-x86-64-specific-optimizatio.patch +0003-postgresql-BUILD-disable-x86-64-specific-optimizatio.patch \ No newline at end of file