[Python-modules-commits] [python-attrs] 06/13: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Tue Jan 23 13:09:36 UTC 2018
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to tag debian/17.4.0-1
in repository python-attrs.
commit 4ac496547d8e9c13409709a1ff49c30ba6639694
Merge: bbe23cf 0b6c884
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date: Tue Jan 23 14:03:22 2018 +0200
merge patched into master
CODE_OF_CONDUCT.rst => .github/CODE_OF_CONDUCT.rst | 2 +-
CONTRIBUTING.rst => .github/CONTRIBUTING.rst | 92 ++-
.../PULL_REQUEST_TEMPLATE.md | 2 +-
.readthedocs.yml | 6 +
.travis.yml | 16 +-
CHANGELOG.rst | 149 +++-
MANIFEST.in | 13 +-
README.rst | 41 +-
changelog.d/.gitignore | 0
changelog.d/261.change.rst | 4 +
changelog.d/280.change.rst | 2 +
changelog.d/284.change.rst | 2 +
changelog.d/285.change.rst | 2 +
changelog.d/286.change.rst | 2 +
changelog.d/287.change.rst | 2 +
changelog.d/291.change.rst | 1 +
changelog.d/292.change.rst | 1 +
changelog.d/295.change.rst | 4 +
changelog.d/296.change.rst | 4 +
changelog.d/298.breaking.rst | 7 +
changelog.d/299.breaking.rst | 7 +
changelog.d/304.breaking.rst | 7 +
changelog.d/306.change.rst | 1 +
changelog.d/307.deprecation.rst | 5 +
changelog.d/308.breaking.rst | 20 +
changelog.d/309.change.rst | 1 +
changelog.d/towncrier_template.rst | 35 +
conftest.py | 18 +-
debian/.git-dpm | 6 +-
...-intersphinx_mapping-at-local-Python-docs.patch | 6 +-
...d-build-directory-to-sys.path-for-autodoc.patch | 4 +-
.../patches/0003-Link-to-local-copy-of-logo.patch | 6 +-
dev-requirements.txt | 6 -
docs-requirements.txt | 3 -
docs/_static/attrs_logo.svg | 1 +
docs/api.rst | 79 +-
docs/conf.py | 6 +-
docs/contributing.rst | 4 +-
docs/examples.rst | 125 ++-
docs/extending.rst | 36 +-
docs/how-does-it-work.rst | 13 +-
docs/index.rst | 67 +-
docs/overview.rst | 36 +-
docs/why.rst | 128 +--
pyproject.toml | 27 +
setup.cfg | 23 +-
setup.py | 19 +-
src/attr/__init__.py | 36 +-
src/attr/_compat.py | 61 +-
src/attr/_funcs.py | 6 +-
src/attr/_make.py | 892 ++++++++++++++++-----
src/attr/exceptions.py | 9 +
src/attr/validators.py | 20 +-
tests/test_annotations.py | 156 ++++
tests/test_dark_magic.py | 119 ++-
tests/test_dunders.py | 80 +-
tests/test_filters.py | 16 +-
tests/test_funcs.py | 83 +-
tests/test_init_subclass.py | 44 +
tests/test_make.py | 571 +++++++++----
tests/test_slots.py | 129 ++-
tests/test_validators.py | 14 +-
tests/utils.py | 41 +-
tox.ini | 51 +-
64 files changed, 2631 insertions(+), 738 deletions(-)
diff --cc debian/.git-dpm
index d45ea4f,0000000..6ac3617
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
- 01bd851dd032ff2a050f489aa2efa59aadbc4a3b
- 01bd851dd032ff2a050f489aa2efa59aadbc4a3b
- 5f47c131690f268c584cb69b4f88d6b50986b57e
++0b6c8843c07d72bff99ac5ecf1e89f0809d8754c
++0b6c8843c07d72bff99ac5ecf1e89f0809d8754c
++1597ed3ba5b2e0ff7faf1fc17936b8fce4776aae
+1597ed3ba5b2e0ff7faf1fc17936b8fce4776aae
+python-attrs_17.4.0.orig.tar.gz
+7487af781f942e370977bb91feedeb4c98edfd07
+90280
+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 a3f960b,0000000..edd5ff6
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,22 -1,0 +1,22 @@@
- From c8973ab31a2804dc30763252def050803a59ae33 Mon Sep 17 00:00:00 2001
++From e2d3677ec5fefc84792a330f87de769e8b3e9d9b 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 bc5dfed..52a04e7 100644
++index 1cdb07c..a914008 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -146,7 +146,7 @@ texinfo_documents = [
++@@ -148,7 +148,7 @@ texinfo_documents = [
+ ]
+
+ 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 58a3945,0000000..fa7a9c8
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,27 -1,0 +1,27 @@@
- From 3b8aee49df1c6d64ed95e45b20fc463cc2af8be2 Mon Sep 17 00:00:00 2001
++From 9b5496d3589b7139df14ce5aefba55944979985e 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 | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 52a04e7..e08b9ed 100644
++index a914008..3d29d96 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -27,6 +27,13 @@ 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
++ver = sys.version_info[0:2]
++sys.path.insert(
++ 0, os.path.abspath('../.pybuild/pythonX.Y_{0}.{1}/build'.format(*ver)))
+
+ # -- General configuration ------------------------------------------------
+
diff --cc debian/patches/0003-Link-to-local-copy-of-logo.patch
index c957cf3,0000000..3cc094a
mode 100644,000000..100644
--- a/debian/patches/0003-Link-to-local-copy-of-logo.patch
+++ b/debian/patches/0003-Link-to-local-copy-of-logo.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 01bd851dd032ff2a050f489aa2efa59aadbc4a3b Mon Sep 17 00:00:00 2001
++From 0b6c8843c07d72bff99ac5ecf1e89f0809d8754c Mon Sep 17 00:00:00 2001
+From: Tristan Seligmann <mithrandi at mithrandi.net>
+Date: Fri, 30 Jun 2017 03:58:13 +0200
+Subject: Link to local copy of logo.
+
+---
+ CHANGELOG.rst | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CHANGELOG.rst b/CHANGELOG.rst
- index fc9148a..fddd1e8 100644
++index ee1da54..200fd96 100644
+--- a/CHANGELOG.rst
++++ b/CHANGELOG.rst
- @@ -39,7 +39,7 @@ To encourage more participation, the project has also been moved into a `dedicat
++@@ -166,7 +166,7 @@ To encourage more participation, the project has also been moved into a `dedicat
+
+ ``attrs`` also has a logo now!
+
+-.. image:: http://www.attrs.org/en/latest/_static/attrs_logo.png
++.. image:: _static/attrs_logo.png
+ :alt: attrs logo
+
+
--
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