Merge branch '1.3'

.travis.yml

@@ -1,6 +1,6 @@
 language: python
 sudo: required
-dist: trusty
+dist: xenial
 cache:
   directories:
     - $HOME/.cache/pip
@@ -9,15 +9,13 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
-  - "3.7-dev"
-  - "nightly"
+  - "3.7"
+  - "3.8-dev"
   - "pypy"
   - "pypy3"
 matrix:
-  # NOTE: comment this out if we have to reinstate any allow_failures, because
-  # of https://github.com/travis-ci/travis-ci/issues/1696 (multiple
-  # notifications)
-  fast_finish: true
+  allow_failures:
+    - python: "3.8-dev"
 install:
   # For some reason Travis' build envs have wildly different pip/setuptools
   # versions between minor Python versions, and this can cause many hilarious
@@ -52,6 +50,10 @@ script:
   # Doctests in websites OK? (Same caveat as above...)
   - "if [[ $TRAVIS_PYTHON_VERSION != 'pypy3' ]]; then inv www.doctest; fi"
   # Did we break setup.py?
+  # NOTE: sometime in 2019 travis grew a bizarre EnvironmentError problem
+  # around inability to overwrite/remote __pycache__ dirs...this attempts to
+  # workaround
+  - "find . -type d -name __pycache__ | sudo xargs rm -rf"
   - inv travis.test-installation --package=invoke --sanity="inv --list"
   # Test distribution builds, including some package_data based stuff
   # (completion script printing)

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019 Jeff Forcier.
+Copyright (c) 2020 Jeff Forcier.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

dev-requirements.txt

@@ -3,9 +3,8 @@
 releases>=0.6.1,<2.0
 alabaster==0.7.12
 # Testing (explicit dependencies to get around a Travis/pip issue)
-# NOTE: pytest-relaxed currently only works with pytest >=3, <3.3
-pytest==3.2.5
-pytest-relaxed==1.1.4
+pytest==4.6.3
+pytest-relaxed==1.1.5
 pytest-cov==2.5.1
 mock==1.0.1
 flake8==3.7.8

setup.cfg

@@ -8,4 +8,7 @@ license_file = LICENSE
 
 [tool:pytest]
 testpaths = tests
-python_files = *
+python_files = *
+filterwarnings =
+    once::Warning
+    ignore::DeprecationWarning

tests/merge_dicts.py

@@ -101,10 +101,11 @@ def dict_value_merges_are_not_references(self):
         assert proj["foo"]["bar"]["biz"] == "proj value"
 
     def merge_file_types_by_reference(self):
-        d1 = {}
-        d2 = {"foo": open(__file__)}
-        merge_dicts(d1, d2)
-        assert d1["foo"].closed is False
+        with open(__file__) as fd:
+            d1 = {}
+            d2 = {"foo": fd}
+            merge_dicts(d1, d2)
+            assert d1["foo"].closed is False
 
 
 class copy_dict_: