Merge pull request #42 from loicgasser/py2_legacy

Drop py 2 support

Author: loicgasser

.flake8

@@ -0,0 +1,62 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+    tags:
+      - "*"
+  pull_request:
+
+jobs:
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+          architecture: x64
+
+      - name: Display Python version
+        run: python -c "import sys; print(sys.version)"
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update -y
+          sudo apt-get install -y python-dev libgeos-dev
+          pip install -U pip setuptools
+          pip install -r dev-requirements.txt
+
+      - name: Lint
+        run: flake8
+
+      - name: Isort
+        run: isort --check-only --diff .
+
+      - name: Test
+        run: coverage run --source=quantized_mesh_tile setup.py test
+
+      - name: Coveralls
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          github-token: ${{ secrets.github_token }}
+          flag-name: run-${{ matrix.python-version }}
+          parallel: true
+
+  coveralls:
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: AndreMiras/coveralls-python-action@develop
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true

.github/workflows/main.yml

@@ -9,3 +9,4 @@ doc/build/
 .idea/
 .coverage
 .vscode
+.eggs

.gitignore

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Gasser Loïc
+Copyright (c) 2021 Gasser Loïc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

.travis.yml

@@ -1,7 +1,7 @@
 quantized-mesh-tile
 ===================
 
-[![Build Status](https://travis-ci.org/loicgasser/quantized-mesh-tile.svg?branch=master)](https://travis-ci.org/loicgasser/quantized-mesh-tile)
+![Build Status](https://github.com/loicgasser/quantized-mesh-tile/workflows/CI/badge.svg?branch=master)
 [![Coverage Status](https://coveralls.io/repos/github/loicgasser/quantized-mesh-tile/badge.svg?branch=master)](https://coveralls.io/github/loicgasser/quantized-mesh-tile?branch=master)
 [![Doc Status](https://readthedocs.org/projects/quantized-mesh-tile/badge/?version=latest)](http://quantized-mesh-tile.readthedocs.io/en/latest/?badge=latest)
 

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -1,6 +1,6 @@
 coveralls
 flake8
-future
+isort
 mock==1.0.1
 nose
 sphinx

README.md

@@ -17,7 +17,7 @@ Reference Documentation
 Requirements
 ------------
 
-Quantized mesh tile requires Python >=2.7 (not including Python 3.x) and GEOS >= 3.3.
+Quantized mesh tile requires Python >= 3.5 and GEOS >= 3.3.
 
 Installation
 ------------

dev-requirements.txt

@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import absolute_import, division
-
 import math
-from builtins import map, object
-
-from past.builtins import xrange
-from past.utils import old_div
 
 from . import cartesian3d as c3d
 
@@ -15,8 +9,9 @@ class BoundingSphere(object):
     def __init__(self, *args, **kwargs):
         MAX = float('infinity')
         MIN = float('-infinity')
-        self.center = list(map(float, kwargs.get('center', [])))
-        self.radius = float(kwargs.get('radius', 0))
+
+        self.center = kwargs.get('center', [])
+        self.radius = kwargs.get('radius', 0)
         self.minPointX = [MAX, MAX, MAX]
         self.minPointY = [MAX, MAX, MAX]
         self.minPointZ = [MAX, MAX, MAX]
@@ -31,7 +26,7 @@ def fromPoints(self, points):
         if nbPositions < 2:
             raise Exception('Your list of points must contain at least 2 points')
 
-        for i in xrange(0, nbPositions):
+        for i in range(0, nbPositions):
             point = points[i]
 
             # Store the points containing the smallest and largest component
@@ -86,7 +81,7 @@ def fromPoints(self, points):
         naiveCenter = c3d.multiplyByScalar(c3d.add(minBoxPt, maxBoxPt), 0.5)
         naiveRadius = 0.0
 
-        for i in xrange(0, nbPositions):
+        for i in range(0, nbPositions):
             currentP = points[i]
 
             # Find the furthest point from the naive center to calculate the naive radius.
@@ -104,12 +99,12 @@ def fromPoints(self, points):
                 # Calculate center of new Ritter sphere
                 oldToNew = oldCenterToPoint - ritterRadius
                 ritterCenter = [
-                    old_div((ritterRadius * ritterCenter[0] + oldToNew * currentP[0]),
-                            oldCenterToPoint),
-                    old_div((ritterRadius * ritterCenter[1] + oldToNew * currentP[1]),
-                            oldCenterToPoint),
-                    old_div((ritterRadius * ritterCenter[2] + oldToNew * currentP[2]),
-                            oldCenterToPoint)
+                    (ritterRadius * ritterCenter[0] +
+                     oldToNew * currentP[0]) / oldCenterToPoint,
+                    (ritterRadius * ritterCenter[1] +
+                     oldToNew * currentP[1]) / oldCenterToPoint,
+                    (ritterRadius * ritterCenter[2] +
+                     oldToNew * currentP[2]) / oldCenterToPoint
                 ]
 
         # Keep the naive sphere if smaller

doc/source/index.rst

@@ -1,11 +1,7 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import division
-
 import math
 
-from past.utils import old_div
-
 
 def magnitudeSquared(p):
     return p[0] ** 2 + p[1] ** 2 + p[2] ** 2
@@ -37,4 +33,4 @@ def multiplyByScalar(p, scalar):
 
 def normalize(p):
     mgn = magnitude(p)
-    return [old_div(p[0], mgn), old_div(p[1], mgn), old_div(p[2], mgn)]
+    return [p[0] / mgn, p[1] / mgn, p[2] / mgn]