diff --git a/.gitignore b/.gitignore
index 467bfb5c..d9c7921a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ parts/
 sdist/
 var/
 wheels/
+pip-wheel-metadata/
+share/python-wheels/
 *.egg-info/
 .installed.cfg
 *.egg
@@ -248,6 +250,10 @@ flycheck_*.el
 # directory configuration
 .dir-locals.el
 
+# network security
+/network-security.data
+
+
 # Vim rules
 # Swap
 [._]*.s[a-v][a-z]
@@ -393,11 +399,17 @@ tmtags
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
-## Build generated
+## User settings
+xcuserdata/
+
+## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
+*.xcscmblueprint
+*.xccheckout
+
+## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
 build/
 DerivedData/
-
-## Various settings
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -406,68 +418,6 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint
-
-## Obj-C/Swift specific
-*.hmap
-*.ipa
-*.dSYM.zip
-*.dSYM
-
-## Playgrounds
-timeline.xctimeline
-playground.xcworkspace
-
-# Swift Package Manager
-#
-# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
-# Packages/
-# Package.pins
-# Package.resolved
-.build/
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# Pods/
-#
-# Add this line if you want to avoid checking in source code from the Xcode workspace
-# *.xcworkspace
-
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-# Carthage/Checkouts
-
-Carthage/Build
-
-# fastlane
-#
-# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
-# screenshots whenever they are needed.
-# For more information about the recommended setup visit:
-# https://docs.fastlane.tools/best-practices/source-control/#source-control
-
-fastlane/report.xml
-fastlane/Preview.html
-fastlane/screenshots/**/*.png
-fastlane/test_output
-
-# Code Injection
-#
-# After new code Injection tools there's a generated folder /iOSInjectionProject
-# https://github.com/johnno1962/injectionforxcode
-
-iOSInjectionProject/
-
 
 # Eclipse rules
 
diff --git a/setup.cfg b/setup.cfg
index 0e0df071..ddac9cb5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ addopts =
   -p no:logging
   --color=yes
   --doctest-glob=*.rst
+  --doctest-modules
   --doctest-ignore-import-error
   --error-for-skips
   --cov
@@ -79,4 +80,8 @@ exclude_lines =
   pragma Python [0-9.,]*${PYTHON_VERSION}[0-9.,]*: no cover
   def message_link
 
+partial_branches =
+  pragma: no ?branch
+  pragma.* ${PLATFORM_SYSTEM}: no branch
+  pragma.* ${OS_NAME}: no branch
 [coverage:force_end_of_section]
diff --git a/test-requirements.txt b/test-requirements.txt
index 40fe81d8..9c1308f4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ coverage==4.4.1
 coverage-env-plugin~=0.1
 coverage-config-reload-plugin~=0.2
 codecov~=2.0.5
-moban~=0.3.1
+moban~=0.3.3 ; python_version > '3.0'
 packaging~=16.8
 pytest~=3.6.1
 pytest-cov~=2.4