From 072bbf60e1f12fd8bc78da3d53b980ea13e35375 Mon Sep 17 00:00:00 2001
From: Sandro Tosi <morph@debian.org>
Date: Sat, 26 Oct 2019 20:53:02 -0400
Subject: [PATCH] Import Debian changes 0.9.4-2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
python-jmespath (0.9.4-2) unstable; urgency=medium
[ Ondřej Nový ]
* Use debhelper-compat instead of debian/compat.
* Bump Standards-Version to 4.4.1.
[ Sandro Tosi ]
* Drop python2 support; Closes: #937851
python-jmespath (0.9.4-1) unstable; urgency=medium
[ Ondřej Nový ]
* d/control: Set Vcs-* to salsa.debian.org
* d/copyright: Use https protocol in Format field
* d/watch: Use https protocol
* d/control: Enable autopkgtest-pkg-python testsuite (Closes: #890511)
* Convert git repository from git-dpm to gbp layout
[ Piotr Ożarowski ]
* Add dh-python to Build-Depends
[ TANIGUCHI Takaki ]
* New upstream version 0.9.4
* Bump Stanrads-Version to 4.3.0
* debian/compat: 12
python-jmespath (0.9.3-1) unstable; urgency=medium
[ Ondřej Nový ]
* Fixed VCS URL (https)
[ TANIGUCHI Takaki ]
* New upstream version 0.9.3
* Bump Standards-Version to 4.0.0 (without changes)
* debian/compat: Bump to 10
python-jmespath (0.9.1-1) unstable; urgency=medium
* New upstream version 0.9.1
* Bump debian policy to 3.9.8
python-jmespath (0.9.0-2) unstable; urgency=medium
* debian/control: Add python-nose and python3-nose to Build-Depends.
(Closes: #804557)
python-jmespath (0.9.0-1) unstable; urgency=medium
* new upstream version
python-jmespath (0.4.1-1) unstable; urgency=medium
* New upstream release
python-jmespath (0.2.1-1) unstable; urgency=low
* Initial release (Closes: #734131)
---
PKG-INFO | 3 ++-
debian/changelog | 15 +++++----------
debian/control | 14 +-------------
debian/python-jmespath.examples | 1 -
debian/rules | 3 +--
debian/salsa-ci.yml | 4 ----
debian/upstream/metadata | 4 ----
jmespath.egg-info/PKG-INFO | 3 ++-
jmespath/__init__.py | 2 +-
jmespath/visitor.py | 6 +++---
setup.py | 2 +-
11 files changed, 16 insertions(+), 41 deletions(-)
delete mode 100644 debian/python-jmespath.examples
delete mode 100644 debian/salsa-ci.yml
delete mode 100644 debian/upstream/metadata
diff --git a/PKG-INFO b/PKG-INFO
index 8e567b4..024f78b 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: jmespath
-Version: 0.9.5
+Version: 0.9.4
Summary: JSON Matching Expressions
Home-page: https://github.com/jmespath/jmespath.py
Author: James Saryerwinnie
Author-email: js@jamesls.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: JMESPath
========
diff --git a/debian/changelog b/debian/changelog
index 56b8dd6..b96302f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,13 @@
-python-jmespath (0.9.5-1) unstable; urgency=medium
+python-jmespath (0.9.4-2) unstable; urgency=medium
[ Ondřej Nový ]
* Use debhelper-compat instead of debian/compat.
* Bump Standards-Version to 4.4.1.
- [ TANIGUCHI Takaki ]
- * add CI config
- * New upstream version 0.9.5
- - Fix SyntaxWarning (Closes: #953534)
- * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
- Repository-Browse.
- * Update standards version to 4.4.1, no changes needed.
-
- -- TANIGUCHI Takaki <takaki@debian.org> Wed, 01 Apr 2020 16:35:10 +0900
+ [ Sandro Tosi ]
+ * Drop python2 support; Closes: #937851
+
+ -- Sandro Tosi <morph@debian.org> Sat, 26 Oct 2019 20:53:02 -0400
python-jmespath (0.9.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ba617ab..8b90985 100644
--- a/debian/control
+++ b/debian/control
@@ -5,27 +5,15 @@ Maintainer: Debian Python Modules Team <python-modules-team@lists.alioth.debian.
Uploaders: TANIGUCHI Takaki <takaki@debian.org>
Build-Depends: debhelper-compat (= 12)
, dh-python
- , python-all
- , python-setuptools
, python3-all
, python3-setuptools
- , python-nose
, python3-nose
-Standards-Version: 4.5.0.1
+Standards-Version: 4.4.1
Homepage: https://github.com/boto/jmespath
Vcs-Git: https://salsa.debian.org/python-team/modules/python-jmespath.git
Vcs-Browser: https://salsa.debian.org/python-team/modules/python-jmespath
Testsuite: autopkgtest-pkg-python
-Package: python-jmespath
-Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
-Description: JSON Matching Expressions (Python 2)
- JMESPath is python library which allows you to declaratively specify how
- to extract elements from a JSON document.
- .
- This package contains the module for Python 2.
-
Package: python3-jmespath
Architecture: all
Depends: ${python3:Depends}, ${misc:Depends}
diff --git a/debian/python-jmespath.examples b/debian/python-jmespath.examples
deleted file mode 100644
index a8bd193..0000000
--- a/debian/python-jmespath.examples
+++ /dev/null
@@ -1 +0,0 @@
-bin/jp.py
diff --git a/debian/rules b/debian/rules
index 0431428..6100a34 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,8 @@
export PYBUILD_NAME=jmespath
%:
- dh $@ --with python2,python3 --buildsystem=pybuild
+ dh $@ --with python3 --buildsystem=pybuild
override_dh_install:
dh_install
- rm -f $(CURDIR)/debian/python-jmespath/usr/bin/jp.py
rm -f $(CURDIR)/debian/python3-jmespath/usr/bin/jp.py
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index 33c3a64..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-include:
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
- - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
deleted file mode 100644
index ed90e20..0000000
--- a/debian/upstream/metadata
+++ /dev/null
@@ -1,4 +0,0 @@
-Bug-Database: https://github.com/jmespath/jmespath.py/issues
-Bug-Submit: https://github.com/jmespath/jmespath.py/issues/new
-Repository: https://github.com/jmespath/jmespath.py.git
-Repository-Browse: https://github.com/jmespath/jmespath.py
diff --git a/jmespath.egg-info/PKG-INFO b/jmespath.egg-info/PKG-INFO
index 8e567b4..024f78b 100644
--- a/jmespath.egg-info/PKG-INFO
+++ b/jmespath.egg-info/PKG-INFO
@@ -1,11 +1,12 @@
Metadata-Version: 1.1
Name: jmespath
-Version: 0.9.5
+Version: 0.9.4
Summary: JSON Matching Expressions
Home-page: https://github.com/jmespath/jmespath.py
Author: James Saryerwinnie
Author-email: js@jamesls.com
License: MIT
+Description-Content-Type: UNKNOWN
Description: JMESPath
========
diff --git a/jmespath/__init__.py b/jmespath/__init__.py
index f8f514b..8392e74 100644
--- a/jmespath/__init__.py
+++ b/jmespath/__init__.py
@@ -1,7 +1,7 @@
from jmespath import parser
from jmespath.visitor import Options
-__version__ = '0.9.5'
+__version__ = '0.9.4'
def compile(expression):
diff --git a/jmespath/visitor.py b/jmespath/visitor.py
index b3e846b..2c783e5 100644
--- a/jmespath/visitor.py
+++ b/jmespath/visitor.py
@@ -29,9 +29,9 @@ def _is_special_integer_case(x, y):
# Also need to consider that:
# >>> 0 in [True, False]
# True
- if type(x) is int and (x == 0 or x == 1):
+ if x is 0 or x is 1:
return y is True or y is False
- elif type(y) is int and (y == 0 or y == 1):
+ elif y is 0 or y is 1:
return x is True or x is False
@@ -257,7 +257,7 @@ class TreeInterpreter(Visitor):
def visit_not_expression(self, node, value):
original_result = self.visit(node['children'][0], value)
- if type(original_result) is int and original_result == 0:
+ if original_result is 0:
# Special case for 0, !0 should be false, not true.
# 0 is not a special cased integer in jmespath.
return False
diff --git a/setup.py b/setup.py
index e7f0e95..938633d 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@ from setuptools import setup, find_packages
setup(
name='jmespath',
- version='0.9.5',
+ version='0.9.4',
description='JSON Matching Expressions',
long_description=io.open('README.rst', encoding='utf-8').read(),
author='James Saryerwinnie',
--
GitLab