[Python-modules-commits] [python-attrs] 05/06: merge patched into master

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository python-attrs.

commit 10448c08499cf81c333927ff897556cbe49e2029
Merge: 2b816b5 f19260c
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Mon Dec 12 02:49:45 2016 +0200

    merge patched into master

 CHANGELOG.rst                                      |  24 +++-
 CONTRIBUTING.rst                                   | 103 +++++++++++++---
 debian/.git-dpm                                    |   6 +-
 ...-intersphinx_mapping-at-local-Python-docs.patch |   2 +-
 ...d-build-directory-to-sys.path-for-autodoc.patch |   2 +-
 docs/api.rst                                       |   8 +-
 docs/examples.rst                                  |  45 ++++++-
 docs/extending.rst                                 |  42 ++++++-
 setup.cfg                                          |   4 +
 src/attr/__init__.py                               |   2 +-
 src/attr/_compat.py                                |  57 ++++++++-
 src/attr/_make.py                                  | 129 +++++++++++++--------
 tests/test_dark_magic.py                           |   1 +
 tests/test_dunders.py                              |  33 +++++-
 tests/test_funcs.py                                |   3 +-
 tests/test_make.py                                 | 108 ++++++++++++++++-
 tests/utils.py                                     |  54 ++++++---
 17 files changed, 527 insertions(+), 96 deletions(-)

diff --cc debian/.git-dpm
index c0ff8c9,0000000..9335eab
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42
- a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42
- 02ab5d9c3a881e4198d291bc7b69b58616faf533
++f19260ca33c981b8835b7b03fa1a7aca8df036fe
++f19260ca33c981b8835b7b03fa1a7aca8df036fe
++f9f18163dabea726ad79ab693f42417448756a26
 +f9f18163dabea726ad79ab693f42417448756a26
 +python-attrs_16.3.0.orig.tar.gz
 +11f397eb6ffb12ddc9a51d353ecab457919fe7ef
 +53347
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
index da7bfb5,0000000..961df54
mode 100644,000000..100644
--- a/debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
+++ b/debian/patches/0001-Point-intersphinx_mapping-at-local-Python-docs.patch
@@@ -1,20 -1,0 +1,20 @@@
- From 0fa216d9a6f9f32de524883c34bf32bfa0e6a3a4 Mon Sep 17 00:00:00 2001
++From 0a67006a07baee3577afc8fe7a45e8676d3af680 Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at mithrandi.net>
 +Date: Mon, 10 Oct 2016 04:40:30 +0200
 +Subject: Point intersphinx_mapping at local Python docs.
 +
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index dbfdf36..2ff5f66 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -300,5 +300,5 @@ texinfo_documents = [
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 + intersphinx_mapping = {
 +-    "https://docs.python.org/3": None,
 ++    'python': ('/usr/share/doc/python3-doc/html', '/usr/share/doc/python3-doc/html/objects.inv')
 + }
diff --cc debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
index b939c94,0000000..d00bc73
mode 100644,000000..100644
--- a/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
+++ b/debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
@@@ -1,23 -1,0 +1,23 @@@
- From a1e2d3c98dbc1fb1f3c5557124ebd72c67913b42 Mon Sep 17 00:00:00 2001
++From f19260ca33c981b8835b7b03fa1a7aca8df036fe Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at mithrandi.net>
 +Date: Mon, 10 Oct 2016 04:42:22 +0200
 +Subject: Add build directory to sys.path for autodoc.
 +
 +---
 + docs/conf.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 2ff5f66..640dd9e 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -47,7 +47,8 @@ def find_version(*file_paths):
 + # If extensions (or modules to document with autodoc) are in another directory,
 + # add these directories to sys.path here. If the directory is relative to the
 + # documentation root, use os.path.abspath to make it absolute, like shown here.
 +-#sys.path.insert(0, os.path.abspath('.'))
 ++import sys
 ++sys.path.insert(0, os.path.abspath('../.pybuild/pythonX.Y_3.5/build'))
 + 
 + # -- General configuration ------------------------------------------------
 + 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-attrs.git