From 4c8c002addefe9974948635ca6b013d9f8291e78 Mon Sep 17 00:00:00 2001 From: jpoole Date: Tue, 19 Apr 2022 15:46:21 +0100 Subject: [PATCH 1/2] Add remote files for the tools and set the default values --- .plzconfig | 6 ++---- tools/BUILD | 29 ++++++++++++++++++++++++++--- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/.plzconfig b/.plzconfig index 21d02ee0..16e3c66f 100644 --- a/.plzconfig +++ b/.plzconfig @@ -12,8 +12,6 @@ ImportPath = github.com/please-build/python-rules ; embedtool = //tools/please_go_embed gotool = //third_party/go:toolchain|go -[Java] -JarCatTool = //tools:arcat [PluginDefinition] name = python @@ -25,7 +23,7 @@ Inherit = true [PluginConfig "pex_tool"] ConfigKey = PexTool -DefaultValue = //tools/please_pex +DefaultValue = //tools:please_pex Inherit = true [PluginConfig "interpreter_options"] @@ -90,7 +88,7 @@ Repeatable = true [PluginConfig "wheel_tool"] ConfigKey = WheelTool -DefaultValue = //tools/wheel_resolver +DefaultValue = //tools:wheel_resolver Optional = true Inherit = true diff --git a/tools/BUILD b/tools/BUILD index 03152603..1cd12918 100644 --- a/tools/BUILD +++ b/tools/BUILD @@ -2,10 +2,33 @@ subinclude("//build_defs:version") version(name = "version") +TOOLS_VERSION = "0.1.1" + +remote_file( + name = "please_pex", + url = f"https://github.com/please-build/python-rules/releases/download/tools-v{TOOLS_VERSION}/please_pex-{TOOLS_VERSION}-{CONFIG.HOSTOS}_{CONFIG.HOSTARCH}", + hashes = [ + "3aa6d8b295bf99797e723bb7a5740de63351f091c64da65fd7ffa0b2c7ea5ce0", # linux_amd64 + "575c065da0053e75e69d6a684b42cd07f775dd2ace9f4b5d26feb37766788587", # linux_arm64 + "d1e58c872bd451eff6afe21513a99ef02e502097bf548c8d7382c2f2c900aef7", # darwin_amd64 + "db72e816085c03160310c18c6a1c6442a2c2e051fba31a7f05b848b0a0efdc77", # darwin_arm64 + "c31cb4ad4e60200de92fd0bf0cebba0a72f4ec0b8ffe56754c7ac2a867e10ed6", # freebsd_amd64 + ], + binary = True, + visibility = ["PUBLIC"], +) + + remote_file( - name = "arcat", - url = f"https://github.com/please-build/arcat/releases/download/v1.0.0/arcat-1.0.0-{CONFIG.HOSTOS}_{CONFIG.HOSTARCH}", - hashes = ["6705304dde3cf358d7b8f5a034dfcc8242474b76d0e439b2f39a7a99f8612749"], + name = "wheel_resolver", + url = f"https://github.com/please-build/python-rules/releases/download/tools-v{TOOLS_VERSION}/wheel_resolver-{TOOLS_VERSION}-{CONFIG.HOSTOS}_{CONFIG.HOSTARCH}", + hashes = [ + "40303befa469874270246082d914aef3f28461456a57e87caf6d0e0eb77d8629", # linux_amd64 + "0c84c59d4ddf1e6904775f7f931a883f98e964f2723a159cce6b8b7dc05f60f6", # linux_arm64 + "7c9244a886d06cc210c9776c0fa177730d9daebcc87db0ed885f215bf338238e", # darwin_amd64 + "e76d21dc9f1e4e4afaec6a91119884c34f640229cf0518b28c2af4ef3eb8f1d1", # darwin_arm64 + "1eec1f69154170702d2f42a88442309648d120ae5020b583a183d1b467767733", # freebsd_amd64 + ], binary = True, visibility = ["PUBLIC"], ) From eaa5bbe4c64e516daaef73c8468270999db5df9c Mon Sep 17 00:00:00 2001 From: Jon Poole Date: Wed, 20 Apr 2022 14:17:38 +0100 Subject: [PATCH 2/2] Do a release too --- ChangeLog | 4 ++++ VERSION | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 558ba7d4..fe709c5e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 0.6.1 +------------- + * Use remote file for tools #69 + Version 0.6.0 ------------- * Set tool-related config to inherit from host repo #58 diff --git a/VERSION b/VERSION index a918a2aa..ee6cdce3 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0 +0.6.1