Merge pull request #31 from sidewalklabs/min-area

fix min area

.travis.yml

@@ -26,10 +26,11 @@ matrix:
       compiler: clang
 
 script:
+- export PATH=$PATH:~/Library/Python/2.7/bin/
 - git submodule update --init --recursive
-- pip install --upgrade pip
-- pip install numpy nose flake8 hacking
-- pip install .
+- pip install --user --upgrade pip
+- pip install --user numpy nose flake8 hacking
+- pip install --user .
 - flake8
 - nosetests-2.7 -vv
 - |

circle.yml

@@ -1,12 +1,9 @@
 machine:
   environment:
-    TESTCMD: 'python -V && pip install .[tests] && flake8 && nosetests --with-coverage -vv'
+    TESTCMD: 'python -V && pip install --upgrade pip && pip install .[tests] && flake8 && nosetests -vv'
 
 test:
   override:
     - deactivate && pyenv shell 2.7.11 && bash -c "$TESTCMD"
     - deactivate && pyenv shell 3.4.4 && bash -c "$TESTCMD"
     - deactivate && pyenv shell 3.5.1 && bash -c "$TESTCMD"
-
-  post:
-    - coveralls

docs/sphinx/api.rst

@@ -12,6 +12,12 @@ API
    :members:
    :undoc-members:
 
+.. autodata:: s2sphere.MIN_AREA
+
+.. autodata:: s2sphere.AVG_AREA
+
+.. autodata:: s2sphere.MAX_AREA
+
 .. autoclass:: s2sphere.Cap
    :members:
    :undoc-members:

docs/sphinx/requirements.txt

@@ -1 +1 @@
-Sphinx>=1.4.1
+Sphinx>=1.6.5

s2sphere/sphere.py

@@ -1655,21 +1655,27 @@ def __init__(self, deriv):
 
 
 class AreaMetric(Metric):
-    """Area metric. A 2D specialization of :class:`s2sphere.Metric`.
+    """Area metric. A 2D specialization of `s2sphere.Metric` (check for API).
 
-    Preconfigured instances of this class are
-    :const:`s2sphere.AVG_AREA`, :const:`s2sphere.MIN_AREA`,
-    :const:`s2sphere.MAX_AREA`.
+    Preconfigured instances of this class are `s2sphere.AVG_AREA`,
+    `s2sphere.MIN_AREA`, `s2sphere.MAX_AREA`.
 
-    see :cpp:class:`S2::AreaMetric`
+    See C++ docs at :cpp:class:`S2::AreaMetric`.
     """
     def __init__(self, deriv):
         super(AreaMetric, self).__init__(deriv, 2)
 
 
-AVG_AREA = AreaMetric(4 * math.pi / 6)  # true for all projections
-MIN_AREA = AreaMetric(8 * math.sqrt(2))  # quadratic projection
-MAX_AREA = AreaMetric(2.635799256963161491)  # quadratic projection
+#: Average cell area for all projections.
+AVG_AREA = AreaMetric(4 * math.pi / 6)
+
+
+#: Minimum cell area for quadratic projections.
+MIN_AREA = AreaMetric(8 * math.sqrt(2) / 9)
+
+
+#: Maximum cell area for quadratic projections.
+MAX_AREA = AreaMetric(2.635799256963161491)
 
 
 def drem(x, y):

setup.py

@@ -27,10 +27,9 @@
             'hacking>=0.11.0',
             'nose>=1.3.4',
             'numpy>=1.11.0',
-            'coveralls>=1.1',
         ],
         'docs': [
-            'Sphinx>=1.4.1',
+            'Sphinx>=1.6.5',
             'sphinx-rtd-theme>=0.1.9',
         ]
     },