Merge pull request #130 from jamescooke/cleanup-examples2

Cleanup examples
jamescooke · Feb 27, 2020 · 96f9ee9 · 96f9ee9
2 parents c9ec0ac + d2b8ce1
commit 96f9ee9
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -20,6 +20,10 @@ Changed
 * Install requires ASTTokens version 2 or greater, was previously
   ``>= 1.1.10``.
 
+* Special test examples that only ran on Python 3.6 and greater, now merged
+  into main test suite. `#128
+  <https://github.com/jamescooke/flake8-aaa/pull/128>`_
+
 Removed
 .......
 

diff --git a/examples/good_py36_plus/test_type_hints.py → examples/good/test_type_hints.py b/examples/good_py36_plus/test_type_hints.py → examples/good/test_type_hints.py
diff --git a/examples/good_py36_plus/test_user_options.py → examples/good/test_user_options.py b/examples/good_py36_plus/test_user_options.py → examples/good/test_user_options.py
diff --git a/tox.ini b/tox.ini
@@ -30,7 +30,7 @@ envlist = py3{6,7,8}-{install,lint,lintexamples,test,doctest,cmd,cmdbad},py36-do
 [install]
 commands =
     flake8 --version
-    flake8 tests examples/good examples/good_py36_plus
+    flake8 tests examples/good
     - bash -c "flake8 examples/bad/ | sort > {envtmpdir}/out"
     diff {envtmpdir}/out examples/bad/bad_expected.out