[Python-modules-commits] [python-attrs] 05/15: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Fri Jun 30 02:27:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository python-attrs.
commit 85189a178c9479fc999579584cd8ff8a9c248ed0
Merge: a629ccd 73fe836
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date: Fri Jun 30 03:30:25 2017 +0200
merge patched into master
.travis.yml | 10 +-
AUTHORS.rst | 2 +-
CHANGELOG.rst | 178 ++++++++--
CONTRIBUTING.rst | 103 ++++--
MANIFEST.in | 14 +-
PULL_REQUEST_TEMPLATE.md | 12 +
README.rst | 92 +++---
conftest.py | 5 +-
debian/.git-dpm | 6 +-
...-intersphinx_mapping-at-local-Python-docs.patch | 10 +-
...d-build-directory-to-sys.path-for-autodoc.patch | 20 +-
dev-requirements.txt | 1 +
docs-requirements.txt | 3 +
docs/_static/attrs_logo.png | Bin 0 -> 7639 bytes
docs/api.rst | 108 ++++++-
docs/conf.py | 185 ++---------
docs/docutils.conf | 3 +
docs/examples.rst | 146 ++++++---
docs/extending.rst | 4 +-
docs/how-does-it-work.rst | 2 +-
docs/index.rst | 6 +-
docs/license.rst | 4 +-
docs/why.rst | 81 +++--
src/attr/__init__.py | 12 +-
src/attr/_funcs.py | 34 ++
src/attr/_make.py | 358 ++++++++++++++++-----
src/attr/converters.py | 24 ++
src/attr/exceptions.py | 9 +
src/attr/validators.py | 84 ++++-
tests/test_converters.py | 36 +++
tests/test_dark_magic.py | 68 +++-
tests/test_dunders.py | 77 ++++-
tests/test_funcs.py | 143 +++++++-
tests/test_make.py | 189 +++++++++--
tests/test_slots.py | 14 +-
tests/test_validators.py | 134 +++++++-
tests/utils.py | 41 ++-
tox.ini | 20 +-
38 files changed, 1664 insertions(+), 574 deletions(-)
diff --cc debian/.git-dpm
index b77c4e2,0000000..0e0dec9
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
- f19260ca33c981b8835b7b03fa1a7aca8df036fe
- f19260ca33c981b8835b7b03fa1a7aca8df036fe
- f9f18163dabea726ad79ab693f42417448756a26
++73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd
++73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd
++5f47c131690f268c584cb69b4f88d6b50986b57e
+5f47c131690f268c584cb69b4f88d6b50986b57e
+python-attrs_17.2.0.orig.tar.gz
+d8c4c3268524de54410fbe4f3a32db9c9de0c843
+70313
+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 961df54,0000000..a3f960b
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,22 @@@
- From 0a67006a07baee3577afc8fe7a45e8676d3af680 Mon Sep 17 00:00:00 2001
++From c8973ab31a2804dc30763252def050803a59ae33 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
++index bc5dfed..52a04e7 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -300,5 +300,5 @@ texinfo_documents = [
++@@ -146,7 +146,7 @@ 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')
+ }
++
++ # Allow non-local URIs so we can have images in CHANGELOG etc.
diff --cc debian/patches/0002-Add-build-directory-to-sys.path-for-autodoc.patch
index d00bc73,0000000..9476a14
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,25 @@@
- From f19260ca33c981b8835b7b03fa1a7aca8df036fe Mon Sep 17 00:00:00 2001
++From 73fe836b0e3e143de16f6a67a3a5fdd3c01bdbdd 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(-)
++ docs/conf.py | 5 +++++
++ 1 file changed, 5 insertions(+)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 2ff5f66..640dd9e 100644
++index 52a04e7..15a41b7 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('.'))
++@@ -27,6 +27,11 @@ def find_version(*file_paths):
++ return version_match.group(1)
++ raise RuntimeError("Unable to find version string.")
++
+++# 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.
++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
More information about the Python-modules-commits
mailing list