DOC: Update install docs [ci skip] (#29)

* DOC: Update install docs [ci skip]

* PKG: use environment markers

* TST: Fix Py2 tests

Author: TomAugspurger

docs/source/install.rst

@@ -1,10 +1,13 @@
 Install
 =======
 
-cyberpandas requires pandas 0.23 or newer, which is currently unreleased.
+cyberpandas requires pandas 0.23 or newer. On Python 2, the 3rd party `ipaddress`
+module is required (it's built into the standard library in Python 3).
 
-Once pandas is installed, cyberpandas can be installed from PyPI
+Once pandas is installed, cyberpandas can be installed from conda-forge::
 
-.. code-block:: none
+    conda install -c conda-forge cyberpandas
 
-   pip install cyberpandas
+Or PyPI:
+
+    pip install cyberpandas

setup.py

@@ -1,17 +1,17 @@
 from setuptools import setup, find_packages
 from os import path
 from codecs import open
-import sys
 
 here = path.abspath(path.dirname(__file__))
 
 with open(path.join(here, 'README.md'), encoding='utf-8') as f:
     long_description = f.read()
 
-install_requires = ['pandas>=0.23.0', 'six']
-
-if sys.version_info.major == 2:
-    install_requires.append('ipaddress')
+install_requires = [
+    "pandas>=0.23.0",
+    "six",
+    "ipaddress; python_version < '3'"
+]
 
 setup(
     name='cyberpandas',

tests/ip/test_ip.py

@@ -314,14 +314,14 @@ def test_from_ndarray(values):
 
 @pytest.mark.parametrize('start, stop, step, expected', [
     (1, 3, None, [1, 2]),
-    ('0.0.0.1', '0.0.0.3', None, [1, 2]),
+    (u'0.0.0.1', u'0.0.0.3', None, [1, 2]),
     (2**64 + 1, 2**64 + 3, None, [2**64 + 1, 2**64 + 2]),
-    ('::1:0:0:0:1', '::1:0:0:0:3', None, [2**64 + 1, 2**64 + 2]),
+    (u'::1:0:0:0:1', u'::1:0:0:0:3', None, [2**64 + 1, 2**64 + 2]),
     (2**64 - 1, 2**64 + 2, None, [2**64 - 1, 2**64, 2**64 + 1]),
-    ('::ffff:ffff:ffff:ffff', '::1:0:0:0:2', None,
+    (u'::ffff:ffff:ffff:ffff', u'::1:0:0:0:2', None,
      [2**64 - 1, 2**64, 2**64 + 1]),
     (1, 6, 2, [1, 3, 5]),
-    ('0.0.0.1', '0.0.0.6', '0.0.0.2', [1, 3, 5]),
+    (u'0.0.0.1', u'0.0.0.6', u'0.0.0.2', [1, 3, 5]),
 ])
 def test_ip_range(start, stop, step, expected):
     result = ip.ip_range(start, stop, step)