python3-jmespath: update to 0.9.5

Message ID cc794db3-60b1-8bc6-7739-fc78bdaf363f@ipfire.org
State Accepted
Commit 7597a209ea3adf7d126187dfa3c555ef3a766327
Headers
Series python3-jmespath: update to 0.9.5 |

Commit Message

Peter Müller May 3, 2020, 10:11 a.m. UTC
  Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/packages/python3-jmespath | 11 +++++------
 lfs/python3-jmespath                       | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)
  

Comments

Michael Tremer May 4, 2020, 11:21 a.m. UTC | #1
Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>

> On 3 May 2020, at 11:11, Peter Müller <peter.mueller@ipfire.org> wrote:
> 
> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
> ---
> config/rootfiles/packages/python3-jmespath | 11 +++++------
> lfs/python3-jmespath                       | 10 +++++-----
> 2 files changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
> index 52fd3a4a1..6f0022a13 100644
> --- a/config/rootfiles/packages/python3-jmespath
> +++ b/config/rootfiles/packages/python3-jmespath
> @@ -1,11 +1,10 @@
> usr/bin/jp.py
> #usr/lib/python3.8/site-packages/jmespath
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/PKG-INFO
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/SOURCES.txt
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/dependency_links.txt
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/pbr.json
> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/top_level.txt
> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info
> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/PKG-INFO
> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/SOURCES.txt
> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/dependency_links.txt
> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/top_level.txt
> usr/lib/python3.8/site-packages/jmespath/__init__.py
> usr/lib/python3.8/site-packages/jmespath/ast.py
> usr/lib/python3.8/site-packages/jmespath/compat.py
> diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
> index 4db53be67..d49a429a6 100644
> --- a/lfs/python3-jmespath
> +++ b/lfs/python3-jmespath
> @@ -1,7 +1,7 @@
> ###############################################################################
> #                                                                             #
> # IPFire.org - A linux based firewall                                         #
> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
> #                                                                             #
> # This program is free software: you can redistribute it and/or modify        #
> # it under the terms of the GNU General Public License as published by        #
> @@ -24,15 +24,15 @@
> 
> include Config
> 
> -VER        = 0.9.3
> +VER        = 0.9.5
> 
> THISAPP    = jmespath-$(VER)
> DL_FILE    = $(THISAPP).tar.gz
> DL_FROM    = $(URL_IPFIRE)
> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
> +DIR_APP    = $(DIR_SRC)/jmespath.py-$(VER)
> TARGET     = $(DIR_INFO)/$(THISAPP)
> PROG       = python3-jmespath
> -PAK_VER    = 2
> +PAK_VER    = 3
> 
> DEPS       =
> 
> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
> 
> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
> 
> -$(DL_FILE)_MD5 = 37a906c06de62bed25ec5cf99cee04a6
> +$(DL_FILE)_MD5 = 81edf8744cade9793164daff3bd16a65
> 
> install : $(TARGET)
> 
> -- 
> 2.26.1
  
Michael Tremer Oct. 6, 2020, 12:12 p.m. UTC | #2
Hi,

This one won’t apply because of differences in the rootfile.

Does this belong to a patchset and it isn’t marked as such?

Could you please rebase and submit again?

-Michael

> On 4 May 2020, at 12:21, Michael Tremer <michael.tremer@ipfire.org> wrote:
> 
> Reviewed-by: Michael Tremer <michael.tremer@ipfire.org>
> 
>> On 3 May 2020, at 11:11, Peter Müller <peter.mueller@ipfire.org> wrote:
>> 
>> Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
>> ---
>> config/rootfiles/packages/python3-jmespath | 11 +++++------
>> lfs/python3-jmespath                       | 10 +++++-----
>> 2 files changed, 10 insertions(+), 11 deletions(-)
>> 
>> diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
>> index 52fd3a4a1..6f0022a13 100644
>> --- a/config/rootfiles/packages/python3-jmespath
>> +++ b/config/rootfiles/packages/python3-jmespath
>> @@ -1,11 +1,10 @@
>> usr/bin/jp.py
>> #usr/lib/python3.8/site-packages/jmespath
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/PKG-INFO
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/SOURCES.txt
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/dependency_links.txt
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/pbr.json
>> -#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/top_level.txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/PKG-INFO
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/SOURCES.txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/dependency_links.txt
>> +#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/top_level.txt
>> usr/lib/python3.8/site-packages/jmespath/__init__.py
>> usr/lib/python3.8/site-packages/jmespath/ast.py
>> usr/lib/python3.8/site-packages/jmespath/compat.py
>> diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
>> index 4db53be67..d49a429a6 100644
>> --- a/lfs/python3-jmespath
>> +++ b/lfs/python3-jmespath
>> @@ -1,7 +1,7 @@
>> ###############################################################################
>> #                                                                             #
>> # IPFire.org - A linux based firewall                                         #
>> -# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
>> +# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
>> #                                                                             #
>> # This program is free software: you can redistribute it and/or modify        #
>> # it under the terms of the GNU General Public License as published by        #
>> @@ -24,15 +24,15 @@
>> 
>> include Config
>> 
>> -VER        = 0.9.3
>> +VER        = 0.9.5
>> 
>> THISAPP    = jmespath-$(VER)
>> DL_FILE    = $(THISAPP).tar.gz
>> DL_FROM    = $(URL_IPFIRE)
>> -DIR_APP    = $(DIR_SRC)/$(THISAPP)
>> +DIR_APP    = $(DIR_SRC)/jmespath.py-$(VER)
>> TARGET     = $(DIR_INFO)/$(THISAPP)
>> PROG       = python3-jmespath
>> -PAK_VER    = 2
>> +PAK_VER    = 3
>> 
>> DEPS       =
>> 
>> @@ -44,7 +44,7 @@ objects = $(DL_FILE)
>> 
>> $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
>> 
>> -$(DL_FILE)_MD5 = 37a906c06de62bed25ec5cf99cee04a6
>> +$(DL_FILE)_MD5 = 81edf8744cade9793164daff3bd16a65
>> 
>> install : $(TARGET)
>> 
>> -- 
>> 2.26.1
>
  

Patch

diff --git a/config/rootfiles/packages/python3-jmespath b/config/rootfiles/packages/python3-jmespath
index 52fd3a4a1..6f0022a13 100644
--- a/config/rootfiles/packages/python3-jmespath
+++ b/config/rootfiles/packages/python3-jmespath
@@ -1,11 +1,10 @@ 
 usr/bin/jp.py
 #usr/lib/python3.8/site-packages/jmespath
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/PKG-INFO
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/SOURCES.txt
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/dependency_links.txt
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/pbr.json
-#usr/lib/python3.8/site-packages/jmespath-0.9.3-py3.8.egg-info/top_level.txt
+#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info
+#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/PKG-INFO
+#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/SOURCES.txt
+#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/dependency_links.txt
+#usr/lib/python3.8/site-packages/jmespath-0.9.5-py3.8.egg-info/top_level.txt
 usr/lib/python3.8/site-packages/jmespath/__init__.py
 usr/lib/python3.8/site-packages/jmespath/ast.py
 usr/lib/python3.8/site-packages/jmespath/compat.py
diff --git a/lfs/python3-jmespath b/lfs/python3-jmespath
index 4db53be67..d49a429a6 100644
--- a/lfs/python3-jmespath
+++ b/lfs/python3-jmespath
@@ -1,7 +1,7 @@ 
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,15 +24,15 @@ 
 
 include Config
 
-VER        = 0.9.3
+VER        = 0.9.5
 
 THISAPP    = jmespath-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
+DIR_APP    = $(DIR_SRC)/jmespath.py-$(VER)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = python3-jmespath
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -44,7 +44,7 @@  objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 37a906c06de62bed25ec5cf99cee04a6
+$(DL_FILE)_MD5 = 81edf8744cade9793164daff3bd16a65
 
 install : $(TARGET)