Compile attrs instances without cmp kwarg if version >= 19.2.0 (#448)

* Compile attrs instances without cmp kwarg if version >= 19.2.0

* Fix Circle config and Makefile

* Specify coverage and safety in Tox envlist

* Not that

Author: chrisrink10

.circleci/config.yml

@@ -19,8 +19,9 @@ jobs:
           environment:
             TOX_NUM_CORES: 2
             TOX_SHOW_OUTPUT: "True"
+            TOX_SKIP_ENV: pypy3
           command: |
-            tox -p $TOX_NUM_CORES -e py36,py37,py38,coverage,mypy,format,lint,safety
+            tox -p $TOX_NUM_CORES
       - save_cache:
           key: deps9-{{ .Branch }}-{{ checksum "tox.ini" }}-{{ checksum "Pipfile.lock" }}
           paths:

Makefile

@@ -27,17 +27,6 @@ repl:
 	@BASILISP_USE_DEV_LOGGER=true pipenv run basilisp repl
 
 
-# Run PyPy tests inside a Docker container for the moment since
-# Pyenv on MacOS still doesn't have PyPy 3.6-7.0.0.
-.PHONY: test-pypy
-test-pypy:
-	@docker run \
-		--mount src=`pwd`,target=/usr/src/app,type=bind \
-		--workdir /usr/src/app \
-		pypy:3.6-7.0-slim-jessie \
-		/bin/sh -c 'pip install tox && tox -e pypy3'
-
-
 .PHONY: pypy-shell
 pypy-shell:
 	@docker run -it \
@@ -49,4 +38,5 @@ pypy-shell:
 
 .PHONY: test
 test:
-	@pipenv run tox -p 4
+	@rm -f .coverage*
+	@TOX_SKIP_ENV='pypy3|safety|coverage' pipenv run tox -p 4

src/basilisp/lang/compiler/generator.py

@@ -866,6 +866,17 @@ def __deftype_member_to_py_ast(
     return handle_deftype_member(ctx, node)
 
 
+_ATTR_CMP_OFF = getattr(attr, "__version_info__", (0,)) >= (19, 2)
+_ATTR_CMP_KWARGS = (
+    [
+        ast.keyword(arg="eq", value=ast.Constant(False)),
+        ast.keyword(arg="order", value=ast.Constant(False)),
+    ]
+    if _ATTR_CMP_OFF
+    else [ast.keyword(arg="cmp", value=ast.Constant(False))]
+)
+
+
 @_with_ast_loc
 def _deftype_to_py_ast(  # pylint: disable=too-many-branches
     ctx: GeneratorContext, node: DefType
@@ -886,8 +897,8 @@ def _deftype_to_py_ast(  # pylint: disable=too-many-branches
     decorator = ast.Call(
         func=_ATTR_CLASS_DECORATOR_NAME,
         args=[],
-        keywords=[
-            ast.keyword(arg="cmp", value=ast.Constant(False)),
+        keywords=_ATTR_CMP_KWARGS
+        + [
             ast.keyword(arg="frozen", value=ast.Constant(node.is_frozen)),
             ast.keyword(arg="slots", value=ast.Constant(True)),
         ],
@@ -1593,7 +1604,7 @@ def _loop_to_py_ast(ctx: GeneratorContext, node: Loop) -> GeneratedPyAST:
         ):
             loop_body_ast: List[ast.AST] = []
             body_ast = _synthetic_do_to_py_ast(ctx, node.body)
-            loop_body_ast.extend(body_ast.dependencies)
+            loop_body_ast.extend(map(statementize, body_ast.dependencies))
             loop_body_ast.append(
                 ast.Assign(
                     targets=[ast.Name(id=loop_result_name, ctx=ast.Store())],

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py36,py37,py38,mypy,format,lint
+envlist = py36,py37,py38,pypy3,coverage,mypy,format,lint,safety
 
 [testenv]
 parallel_show_output = {env:TOX_SHOW_OUTPUT:false}