Run of fresh-releases for mercantile

Try this locally (using silver-platter):

debian-svp new-upstream mercantile 

Merge these changes:

git pull https://janitor.debian.net/git/mercantile fresh-releases/main
git pull https://janitor.debian.net/git/mercantile fresh-releases/pristine-tar
git pull https://janitor.debian.net/git/mercantile fresh-releases/upstream

Summary

Merged new upstream version: 1.1.6 (was: 1.1.5).

Diff

Branch: main

diff --git a/AUTHORS.txt b/AUTHORS.txt
index 887990d..7061dfe 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -11,6 +11,8 @@ Daniel J. H <daniel+github@trvx.org>
 Jacob Wasserman <jwasserman@gmail.com>
 James Gill <jagill@users.noreply.github.com>
 Jeremiah Cooper <JCooper@jeremiahcooper.com>
+Michal Migurski <mike-github@teczno.com>
+Patrick Young <patrick.mckendree.young@gmail.com>
 Rohit Singh <singhrohit2@hotmail.com>
 Stefano Costa <steko@iosa.it>
 drnextgis <rykovd@gmail.com>
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f64b8d..2ae8e2b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Changes
 =======
 
+1.1.6 (2020-08-24)
+------------------
+
+- In some cases tile() could return a Tile with float x or y attributes (#115).
+  This is a new bug in 1.1.5 and breaks some user code on Python 2.7 and is now
+  fixed.
+
 1.1.5 (2020-06-16)
 ------------------
 
diff --git a/debian/changelog b/debian/changelog
index 63adb7f..83837b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-mercantile (1.1.5-2) UNRELEASED; urgency=medium
+mercantile (1.1.6-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * Bump watch file version to 4.
   * Bump Standards-Version to 4.5.1, no changes.
   * Update watch file for GitHub URL changes.
 
- -- Bas Couwenberg <sebastic@debian.org>  Fri, 06 Nov 2020 19:32:16 +0100
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 28 Mar 2021 06:10:53 -0000
 
 mercantile (1.1.5-1) unstable; urgency=medium
 
diff --git a/mercantile/__init__.py b/mercantile/__init__.py
index 7353538..dc498ea 100644
--- a/mercantile/__init__.py
+++ b/mercantile/__init__.py
@@ -16,7 +16,7 @@ else:
     from collections.abc import Sequence
 
 
-__version__ = "1.1.5"
+__version__ = "1.1.6"
 
 __all__ = [
     "Bbox",
@@ -340,14 +340,14 @@ def tile(lng, lat, zoom, truncate=False):
         # To address loss of precision in round-tripping between tile
         # and lng/lat, points within EPSILON of the right side of a tile
         # are counted in the next tile over.
-        xtile = math.floor((x + EPSILON) * Z2)
+        xtile = int(math.floor((x + EPSILON) * Z2))
 
     if y <= 0:
         ytile = 0
     elif y >= 1:
         ytile = int(Z2 - 1)
     else:
-        ytile = math.floor((y + EPSILON) * Z2)
+        ytile = int(math.floor((y + EPSILON) * Z2))
 
     return Tile(xtile, ytile, zoom)
 

Branch: pristine-tar

diff --git a/mercantile_1.1.6.orig.tar.gz.delta b/mercantile_1.1.6.orig.tar.gz.delta
new file mode 100644
index 0000000..49b3ace
Binary files /dev/null and b/mercantile_1.1.6.orig.tar.gz.delta differ
diff --git a/mercantile_1.1.6.orig.tar.gz.id b/mercantile_1.1.6.orig.tar.gz.id
new file mode 100644
index 0000000..b19feea
--- /dev/null
+++ b/mercantile_1.1.6.orig.tar.gz.id
@@ -0,0 +1 @@
+ae3b474087b96dc846f2a39e2347cf3e1a301160

Branch: upstream

Tag: upstream/1.1.6
diff --git a/AUTHORS.txt b/AUTHORS.txt
index 887990d..7061dfe 100644
--- a/AUTHORS.txt
+++ b/AUTHORS.txt
@@ -11,6 +11,8 @@ Daniel J. H <daniel+github@trvx.org>
 Jacob Wasserman <jwasserman@gmail.com>
 James Gill <jagill@users.noreply.github.com>
 Jeremiah Cooper <JCooper@jeremiahcooper.com>
+Michal Migurski <mike-github@teczno.com>
+Patrick Young <patrick.mckendree.young@gmail.com>
 Rohit Singh <singhrohit2@hotmail.com>
 Stefano Costa <steko@iosa.it>
 drnextgis <rykovd@gmail.com>
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f64b8d..2ae8e2b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Changes
 =======
 
+1.1.6 (2020-08-24)
+------------------
+
+- In some cases tile() could return a Tile with float x or y attributes (#115).
+  This is a new bug in 1.1.5 and breaks some user code on Python 2.7 and is now
+  fixed.
+
 1.1.5 (2020-06-16)
 ------------------
 
diff --git a/mercantile/__init__.py b/mercantile/__init__.py
index 7353538..dc498ea 100644
--- a/mercantile/__init__.py
+++ b/mercantile/__init__.py
@@ -16,7 +16,7 @@ else:
     from collections.abc import Sequence
 
 
-__version__ = "1.1.5"
+__version__ = "1.1.6"
 
 __all__ = [
     "Bbox",
@@ -340,14 +340,14 @@ def tile(lng, lat, zoom, truncate=False):
         # To address loss of precision in round-tripping between tile
         # and lng/lat, points within EPSILON of the right side of a tile
         # are counted in the next tile over.
-        xtile = math.floor((x + EPSILON) * Z2)
+        xtile = int(math.floor((x + EPSILON) * Z2))
 
     if y <= 0:
         ytile = 0
     elif y >= 1:
         ytile = int(Z2 - 1)
     else:
-        ytile = math.floor((y + EPSILON) * Z2)
+        ytile = int(math.floor((y + EPSILON) * Z2))
 
     return Tile(xtile, ytile, zoom)
 

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/PKG-INFO
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/dependency_links.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/entry_points.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/not-zip-safe
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/requires.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.6.egg-info/top_level.txt

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/PKG-INFO
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/dependency_links.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/entry_points.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/not-zip-safe
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/requires.txt
-rw-r--r--  root/root   /usr/lib/python3/dist-packages/mercantile-1.1.5.egg-info/top_level.txt

No differences were encountered between the control files of package mercantile

No differences were encountered between the control files of package python3-mercantile

Lintian Result

Full worker log Full build log