[Python-modules-commits] [setuptools-scm] 02/03: record new upstream branch created by importing setuptools-scm_1.10.1.orig.tar.bz2 and merge it

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository setuptools-scm.

commit 6e7ac94f589e57bd9098b3860d87dde55e772982
Merge: 1735d43 b08aa7e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Dec 15 20:06:34 2015 +0300

    record new upstream branch created by importing setuptools-scm_1.10.1.orig.tar.bz2 and merge it

 .hgtags                                  |   1 +
 CHANGELOG.rst                            |  26 +++++
 PKG-INFO                                 |  38 ++++++-
 README.rst                               |  36 +++++-
 debian/.git-dpm                          |  14 +--
 setup.cfg                                |   5 +-
 setup.py                                 |   8 +-
 setuptools_scm.egg-info/PKG-INFO         |  38 ++++++-
 setuptools_scm.egg-info/SOURCES.txt      |   4 +
 setuptools_scm.egg-info/entry_points.txt |   6 +
 setuptools_scm/__init__.py               |  55 +++++++--
 setuptools_scm/__main__.py               |   5 +-
 setuptools_scm/git.py                    |   7 +-
 setuptools_scm/hg.py                     |   6 +-
 setuptools_scm/version.py                |   4 +-
 testing/conftest.py                      |  54 +++++++++
 testing/test_basic_api.py                | 184 +++++--------------------------
 testing/test_git.py                      |  44 ++++++++
 testing/test_main.py                     |   9 ++
 testing/test_mercurial.py                |  97 ++++++++++++++++
 20 files changed, 450 insertions(+), 191 deletions(-)

diff --cc debian/.git-dpm
index 5b08ba7,0000000..4bd007b
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
- a7c120e83d18a115de3e009f6320be9c5fc57d29
- a7c120e83d18a115de3e009f6320be9c5fc57d29
- a7c120e83d18a115de3e009f6320be9c5fc57d29
- a7c120e83d18a115de3e009f6320be9c5fc57d29
- setuptools-scm_1.8.0.orig.tar.bz2
- 03fdbb5f2023407c23ef38080a823cb195e51e01
- 14491
++b08aa7e7cb402c11adc6e793320215f6f62f54e4
++b08aa7e7cb402c11adc6e793320215f6f62f54e4
++b08aa7e7cb402c11adc6e793320215f6f62f54e4
++b08aa7e7cb402c11adc6e793320215f6f62f54e4
++setuptools-scm_1.10.1.orig.tar.bz2
++c953cc4228654d151be4cd84db6391fd050eb3bf
++16244
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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