PB-1968: Drop Python 2 support

Author: msom

README.md

@@ -1,19 +1,14 @@
-gatilegrid
-===========
+# gatilegrid
 
-![Build Status](https://codebuild.eu-central-1.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiY1JweHpoMGV5cndNTjFRT1JXc0tNK0tyK0NSL3NoVWhXK3BFNU9DZFBEc3M5clN4RzdZMDc1czk5VUJiV1RFSk5YR0lFR1g4dVBES0FTMmpyVTNCcU0wPSIsIml2UGFyYW1ldGVyU3BlYyI6Im5qQWZtZ0lTWDFIelk0cG0iLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
-
-## Geoadmin custom tile grid for web mapping applications
-
-gatilegrid is compatible with python 2.7, 3.5, 3.6, 3.7 and 3.8
+Geoadmin custom tile grid for web mapping applications.
 
 ## Installation
 
 ```bash
 $ pip install gatilegrid
 ```
 
-### Usage
+## Usage
 
 Several tile grids are supported, namely 21781, 2056, 3857 and 4326. Here is an exemple using 21781.
 For 4326, an additional parameter is available (`tmsCompatible=True`).
@@ -155,65 +150,25 @@ print(maxRow)
 >>> 1959
 ```
 
-### Tests
-
-```
-source .venv/bin/activate
-python setup.py test
-
-```
-
-### Publish a new version of the module
-
-Edit `$HOME/.pypirc` and add (username and password in keepass):
-
-```
-[distutils]
-index-servers =
-  pypi
-  pypitest
-
-[pypi]
-repository=https://upload.pypi.org/legacy/
-username=iwi***
-password=
-
-[pypitest]
-repository=https://test.pypi.org/legacy/
-username=iwi***
-password=
-```
-
-Bump version in `setup.py`.
+## Local Development
 
-Build, check and upload the new module to the test repository:
+### Setup
 
-```
-pip install --upgrade twine wheel setuptools
-python setup.py sdist bdist_wheel
-twine upload --repository testpypi dist/*
+```bash
+python -m venv .venv
+source .venv/bin/activate
+pip install .
+pip install nose2 flake8
 ```
 
-Test local install from test repository.
+### Tests
 
-```
-pip install -i https://test.pypi.org/simple/ gatilegrid
+```bash
+nose2 tests
 ```
 
-If everything is ok, push the new version to the default repository.
+### Linting
 
+```bash
+flake8 --ignore=F401 gatilegrid tests
 ```
-twine upload --repository pypi dist/*
-```
-
-Test the newly created module.
-
-Create a RELEASE in github.
-
-#### CONTRIBUTORS:
-
-- [Loic Gasser](https://github.com/loicgasser)
-- [Marc Monnerat](https://github.com/procrastinatio)
-- [Nadine Piveteau](https://github.com/nadine-piveteau)
-- [Marcel Clausen](https://github.com/ltclm)
-- [Gilbert Jeinziner](https://github.com/gjn)

buildspec.yml

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-
 import math
-from past.builtins import xrange
 
 
 class Grid:
@@ -34,8 +31,8 @@ def __init__(self, extent, resolutionX, resolutionY):
         self._setExtentAddress()
 
     def __iter__(self):
-        for col in xrange(0, self.nbCellsX):
-            for row in xrange(0, self.nbCellsY):
+        for col in range(0, self.nbCellsX):
+            for row in range(0, self.nbCellsY):
                 cellExtent = self.cellExtent(col, row)
                 yield (cellExtent, col, row)
 

gatilegrid/grid.py

@@ -1,7 +1,4 @@
-# -*- coding: utf-8 -*-
-
 import math
-from past.builtins import xrange
 
 
 EPSG4326_METERS_PER_UNIT = math.pi * 6378137 / 180
@@ -257,10 +254,10 @@ def iterGrid(self, minZoom, maxZoom):
         assert maxZoom in range(0, len(self.RESOLUTIONS))
         assert minZoom <= maxZoom
 
-        for zoom in xrange(minZoom, maxZoom + 1):
+        for zoom in range(minZoom, maxZoom + 1):
             [minRow, minCol, maxRow, maxCol] = self.getExtentAddress(zoom)
-            for row in xrange(minRow, maxRow + 1):
-                for col in xrange(minCol, maxCol + 1):
+            for row in range(minRow, maxRow + 1):
+                for col in range(minCol, maxCol + 1):
                     tileBounds = self.tileBounds(zoom, col, row)
                     yield (tileBounds, zoom, col, row)
 
@@ -287,7 +284,7 @@ def totalNumberOfTiles(self, minZoom=None, maxZoom=None):
             maxZoom = maxZoom + 1
         else:
             maxZoom = len(self.RESOLUTIONS)
-        for zoom in xrange(minZoom, maxZoom):
+        for zoom in range(minZoom, maxZoom):
             nbTiles += self.numberOfTilesAtZoom(zoom)
         return nbTiles
 
@@ -443,7 +440,7 @@ def __init__(self,
                  originCorner='top-left',
                  useSwissExtent=True):
 
-        super(GeoadminTileGridLV03, self).__init__(
+        super().__init__(
             extent=extent,
             tileSizePx=tileSizePx,
             originCorner=originCorner,
@@ -459,7 +456,7 @@ def __init__(self,
                  originCorner='top-left',
                  useSwissExtent=True):
 
-        super(GeoadminTileGridLV95, self).__init__(
+        super().__init__(
             extent=extent,
             tileSizePx=tileSizePx,
             originCorner=originCorner,
@@ -475,7 +472,7 @@ def __init__(self,
                  originCorner='top-left',
                  useSwissExtent=True):
 
-        super(GlobalMercatorTileGrid, self).__init__(
+        super().__init__(
             extent=extent,
             tileSizePx=tileSizePx,
             originCorner=originCorner,
@@ -492,7 +489,7 @@ def __init__(self,
                  tmsCompatible=True,
                  useSwissExtent=True):
 
-        super(GlobalGeodeticTileGrid, self).__init__(
+        super().__init__(
             extent=extent,
             tileSizePx=tileSizePx,
             originCorner=originCorner,

gatilegrid/tilegrids.py

@@ -1,8 +1,3 @@
-# -*- coding: utf-8 -*-
-
-# HACK for `nose.collector` to work on python 2.7.3 and earlier
-import multiprocessing
-import os
 from setuptools import setup
 
 
@@ -11,7 +6,7 @@
 
 
 setup(name='gatilegrid',
-      version='0.2.0',
+      version='1.0.0',
       description='Popular tile grids and grids API for web mapping applications',
       keywords='gis wmts grid map',
       author='Loic Gasser',
@@ -27,20 +22,17 @@
             'License :: OSI Approved :: MIT License',
             'Operating System :: OS Independent',
             'Programming Language :: Python',
-            'Programming Language :: Python :: 2',
-            'Programming Language :: Python :: 2.7',
             'Programming Language :: Python :: 3',
-            'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6',
-            'Programming Language :: Python :: 3.7',
-            'Programming Language :: Python :: 3.8',
+            'Programming Language :: Python :: 3.10',
+            'Programming Language :: Python :: 3.11',
+            'Programming Language :: Python :: 3.12',
+            'Programming Language :: Python :: 3.13',
             'Topic :: Scientific/Engineering :: GIS',
             'Topic :: Software Development :: Libraries :: Python Modules'
         ],
       zip_safe=False,
       long_description=long_description,
       long_description_content_type='text/markdown',
-      test_suite='nose.collector',
-      install_requires=['future'],
-      python_requires='>2.6, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*, <4',
+      install_requires=[],
+      python_requires='>=3.10',
       )

setup.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

tests/__init__.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import unittest
 from gatilegrid.grid import Grid
 

tests/test_grid.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 import math
 import unittest
 from gatilegrid import getTileGrid, GeoadminTileGridLV03, \