Improve test (ianlini#15)

* replace nose with pytest * refactor tests to use pytest * fully remove nose * fix tox * test python 3.8 * add python 3.8 support to classifiers
AlexTelon · Sep 13, 2019 · 8922007 · 8922007
1 parent ca2ace2
commit 8922007
Show file tree

Hide file tree

Showing 11 changed files with 351 additions and 239 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,7 +8,7 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 indent_size = 2
 
-[*.py]
+[*.{py,ini,cfg}]
 indent_size = 4
 
 [*.md]

diff --git a/.gitignore b/.gitignore
@@ -44,6 +44,7 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
@@ -90,5 +91,3 @@ ENV/
 
 # VS Code settings
 .vscode
-
-.noseids
diff --git a/.travis.yml b/.travis.yml
@@ -11,8 +11,7 @@ matrix:
     - python: '3.5'
     - python: '3.6'
     - python: '3.7'
-      dist: xenial
-      sudo: true
+    - python: '3.8-dev'
     - python: '3.6'
       env: TOXENV=flake8
 

diff --git a/Pipfile b/Pipfile
@@ -4,10 +4,11 @@ url = "https://pypi.org/simple"
 verify_ssl = true
 
 [dev-packages]
-nose = "*"
 tox = "*"
 flake8 = "*"
 docutils = "*"
+pytest = "*"
+coverage = "*"
 
 [packages]
 six = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/flatten_dict/flatten_dict.py b/flatten_dict/flatten_dict.py
@@ -1,4 +1,7 @@
-from collections import Mapping
+try:
+    from collections.abc import Mapping
+except ImportError:
+    from collections import Mapping
 
 import six