Add support for Python 3.5

Author: brandonwillard

.travis.yml

@@ -2,18 +2,20 @@ dist: xenial
 language: python
 
 python:
+  - "3.5"
   - "3.6"
   - "3.7"
+  - "pypy3.5"
 
 install:
-  - pip install pytest coverage pytest-cov flake8 black
+  - pip install -r requirements-dev.txt
   - pip install -e ./
 
 script:
-  - flake8 cons
-  - flake8 tests
-  - black --check cons
-  - black --check tests
+  - flake8 cons tests
+  - if [[ `command -v black` ]]; then
+      black --check cons tests;
+    fi
   - pytest -v tests/ --cov=cons/
 
 after_success:

requirements-dev.txt

@@ -0,0 +1,5 @@
+pytest-cov
+pytest>=3.6
+coverage
+flake8
+black; python_version >= '3.6'

setup.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env python
+from os.path import exists
 from setuptools import find_packages, setup
 
 setup(
     name="cons",
-    version="0.1.0",
+    version="0.1.2",
     install_requires=[
         'toolz',
         'multipledispatch',
@@ -15,19 +16,27 @@
     ],
     author="Brandon T. Willard",
     author_email="brandonwillard+cons@gmail.com",
-    long_description="""An implementation of Lisp/Scheme-like cons in Python.""",
+    description="""An implementation of Lisp/Scheme-like cons in Python.""",
+    long_description=open('README.md').read() if exists("README.md") else "",
+    long_description_content_type='text/markdown',
     license="LGPL-3",
     url="https://github.com/brandonwillard/python-cons",
     platforms=['any'],
-    python_requires='>=3.6',
+    python_requires='>=3.5',
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Intended Audience :: Science/Research",
         "Intended Audience :: Developers",
         "License :: DFSG approved",
         "License :: OSI Approved :: GNU Lesser General Public License v3 or later (LGPLv3+)",
         "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.5",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: Implementation :: CPython",
+        "Programming Language :: Python :: Implementation :: PyPy",
         "Topic :: Software Development :: Libraries",
     ]
 )

tests/test_cons.py

@@ -163,7 +163,7 @@ def test_car_cdr():
     assert cdr(cons("a", ["b"])) == ["b"]
     assert car(OrderedDict([(1, 2), (3, 4)])) == (1, 2)
     assert cdr(OrderedDict([(1, 2), (3, 4)])) == [(3, 4)]
-    assert cdr(OrderedDict({(1): 2})) == []
+    assert cdr(OrderedDict({1: 2})) == []
 
     assert car(cons(1, cons("a", "b"))) == 1
     assert cdr(cons(1, cons("a", "b"))) == cons("a", "b")
@@ -173,29 +173,34 @@ def test_unification():
     car_lv, cdr_lv = var(), var()
 
     res = unify([1, 2], cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: 1, cdr_lv: [2]}
+    assert res[car_lv] == 1
+    assert res[cdr_lv] == [2]
 
     res = unify([], cons(car_lv, cdr_lv), {})
     assert res is False
 
     res = unify([1], cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: 1, cdr_lv: []}
+    assert res[car_lv] == 1
+    assert res[cdr_lv] == []
 
     res = unify((1, 2), cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: 1, cdr_lv: (2,)}
+    assert res[car_lv] == 1
+    assert res[cdr_lv] == (2,)
 
     res = unify((), cons(car_lv, cdr_lv), {})
     assert res is False
 
     res = unify((1,), cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: 1, cdr_lv: ()}
+    assert res[car_lv] == 1
+    assert res[cdr_lv] == ()
 
     res = unify(iter([1]), cons(car_lv, cdr_lv), {})
     assert res[car_lv] == 1
     assert list(res[cdr_lv]) == []
 
-    res = unify(OrderedDict({"a": 1, "b": 2}), cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: ("a", 1), cdr_lv: [("b", 2)]}
+    res = unify(OrderedDict([("a", 1), ("b", 2)]), cons(car_lv, cdr_lv), {})
+    assert res[car_lv] == ("a", 1)
+    assert res[cdr_lv] == [("b", 2)]
 
     res = unify(OrderedDict(), cons(car_lv, cdr_lv), {})
     assert res is False
@@ -215,7 +220,8 @@ def test_unification():
     assert res is False
 
     res = unify(OrderedDict({"a": 1}), cons(car_lv, cdr_lv), {})
-    assert res == {car_lv: ("a", 1), cdr_lv: []}
+    assert res[car_lv] == ("a", 1)
+    assert res[cdr_lv] == []
 
     res = reify(cons(1, cdr_lv), {cdr_lv: [2, 3]})
     assert res == [1, 2, 3]