Hello community,
here is the log from the commit of package python3-setuptools_scm for
openSUSE:Factory checked in at 2015-09-24 06:15:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python3-setuptools_scm (Old)
and /work/SRC/openSUSE:Factory/.python3-setuptools_scm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-setuptools_scm"
Changes:
--------
---
/work/SRC/openSUSE:Factory/python3-setuptools_scm/python3-setuptools_scm.changes
2015-08-31 22:59:01.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.python3-setuptools_scm.new/python3-setuptools_scm.changes
2015-09-24 06:16:16.000000000 +0200
@@ -1,0 +2,13 @@
+Sat Sep 19 14:49:36 UTC 2015 - [email protected]
+
+- specfile:
+ * pypi changed from tar.gz to tar.bz2
+ * some tests call python, but need to call python3. fixed via sed call
+
+- update to version 1.8.0:
+ * fix issue with setuptools wrong version warnings being printed to
+ standard out. User is informed now by distutils-warnings.
+ * restructure root finding, we now reliably ignore outer scm and
+ prefer PKG-INFO over scm, fixes #43 and #45
+
+-------------------------------------------------------------------
Old:
----
setuptools_scm-1.7.0.tar.gz
New:
----
setuptools_scm-1.8.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python3-setuptools_scm.spec ++++++
--- /var/tmp/diff_new_pack.vwEYZX/_old 2015-09-24 06:16:16.000000000 +0200
+++ /var/tmp/diff_new_pack.vwEYZX/_new 2015-09-24 06:16:16.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package python3-setuptools_scm
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,13 +17,13 @@
Name: python3-setuptools_scm
-Version: 1.7.0
+Version: 1.8.0
Release: 0
Summary: the blessed package to manage your versions by scm tags
License: MIT
Group: Development/Languages/Python
Url: https://github.com/pypa/setuptools_scm
-Source0:
https://pypi.python.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.gz
+Source0:
https://pypi.python.org/packages/source/s/setuptools_scm/setuptools_scm-%{version}.tar.bz2
BuildRequires: python3-devel
BuildRequires: python3-setuptools
# Testing requirements
@@ -41,6 +41,8 @@
%prep
%setup -q -n setuptools_scm-%{version}
+# fix python version used in some tests
+sed -i "s/python/python3/g" testing/test_regressions.py
%build
python3 setup.py build
@@ -56,5 +58,4 @@
%{python3_sitelib}/*
%doc README.rst CHANGELOG.rst LICENSE
-
%changelog
++++++ setuptools_scm-1.7.0.tar.gz -> setuptools_scm-1.8.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/.gitignore
new/setuptools_scm-1.8.0/.gitignore
--- old/setuptools_scm-1.7.0/.gitignore 2015-07-22 23:08:49.000000000 +0200
+++ new/setuptools_scm-1.8.0/.gitignore 2015-09-17 22:46:32.000000000 +0200
@@ -1,5 +1,3 @@
-*.sublime-workspace
-# Created by .ignore support plugin (hsz.mobi)
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
@@ -7,81 +5,24 @@
## Directory-based project format:
.idea/
-# if you remove the above rule, at least ignore the following:
-
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
-
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
-
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
-
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
-
-## File-based project format:
-*.ipr
-*.iws
-
-## Plugin-specific files:
-
-# IntelliJ
-/out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
### Python template
-# Byte-compiled / optimized / DLL files
+# Byte-compiled / optimized
__pycache__/
*.py[cod]
*$py.class
-# C extensions
-*.so
# Distribution / packaging
-.Python
-env/
.env/
+env/
build/
-develop-eggs/
dist/
-downloads/
-eggs/
.eggs/
lib/
lib64/
-parts/
-sdist/
-var/
*.egg-info/
-.installed.cfg
-*.egg
-
-# PyInstaller
-# Usually these files are written by a python script from a template
-# before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
# Installer logs
pip-log.txt
@@ -97,15 +38,5 @@
coverage.xml
*,cover
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-
# Sphinx documentation
docs/_build/
-
-# PyBuilder
-target/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/.hgignore
new/setuptools_scm-1.8.0/.hgignore
--- old/setuptools_scm-1.7.0/.hgignore 2015-06-14 08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/.hgignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-hgdistver_version.py
-MANIFEST$
-.*\.egg-info
-dist/
-build/
-\.tox/
-\.cache/
-\.env/
-\.eggs/
-README.html
-setuptools_scm.sublime-workspace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/.hgtags
new/setuptools_scm-1.8.0/.hgtags
--- old/setuptools_scm-1.7.0/.hgtags 2015-07-13 19:37:59.000000000 +0200
+++ new/setuptools_scm-1.8.0/.hgtags 1970-01-01 01:00:00.000000000 +0100
@@ -1,39 +0,0 @@
-5a1fb86fd036b7de8b0d9652d8e47617cf2acbd9 0.1
-bb5b77c4d44a0ff5d80cf3c141e831e77c718f02 0.2
-6ff0dcbf7770ebb4dd593a4b435bc46ac909e6ab 0.3
-1acb97d6a55aa0b956db8193fc7fae50bd065c0f 0.4
-62dae146b56bc1828102b61e9b6667dfc63c006e 0.5
-836009e39e255ae221e32d43a7004b60fe0269a5 0.6
-156ee55e5c5154c1838374f7c44775613755c2df 0.7
-bfa4d0354c33c05e1e5d58b9060b54c60d9b4e86 0.8
-630256b99077bb5e77bfeb96df058ddd98d517f1 v0.9
-c1bdd4532888a0d653e2b92b774fb7ec158d99fe v0.10
-ca5ab7702e0abbf4f8c846d2422ecc7547334b8f v0.11
-1ff10ede9752968a4f7f7caa2fb75ada1523ad4c v0.12
-28e8bfd75e24bb237cb127939066812c0772f454 v0.13
-c1a2f630f85f26bf97f3c43aa0d6e788bc4f6911 v0.14
-40c3034fbf77b3eec7793c51e49700a72aaecaed v0.15
-98c422bd9979ee2337b6aeb0c97d2d67e3b0ca9d v0.16
-acf94020b01dddef99dd062e70d653f31227bfc1 fun
-449046fe8ac80306c0aab4238f866d0415825027 v0.17
-c863bbaf37a52b22011009631734d51866801d36 v0.18
-c055726a3dbd8ee13e3375d90628018bfa363655 v0.19
-145583fdc0ddac2814566ced1a1cc0cf2fa937fc v0.20
-c7db6b8a56dc63fee018f9a932855f599d5cf103 v0.21
-94cba47d598caf2f5de1d11b795fc5c716d4731b v0.22
-a261171f3995ab354b9074be6dd101bbe5d854ad v0.23
-4fb06cd94326c47602d3a71e554da57461968327 v0.24
-6032e2451ecce6cc7ef17252261e182407ad9776 v0.25
-710108024954aeb8dcfa82f0fa004695164e7af7 v0.26
-4fc12441ad28a14561d86ae3862ff96dd4250c3a v1.0.0
-6b87eb7b2f24760758696de642f889a95ca6ae2e v1.1.0
-10e1e1aa407cbc8cd0853249b8adfaece44a6afc v1.2.0
-09958ba5ec6a711a25411bc3473c49f08cffe504 v1.3.0
-5532a024bba6159f1adc8bf8cd56c9b1946991bd v1.4.0
-5cd2569410b5edc45e8294154b7326c91681222b v1.4.1
-4fe1d9fcc3b0dd53de296d829159fe533d5f1dd2 v1.5.0
-8d43dd687e7ad7e2f5f2558478a1c243d6c272cd v1.5.1
-5a29ae7e98cac33723f57b3f14f4b1cb39f42379 v1.5.2
-e8e83b611dc80cf04aa1c23c885c02b18636218b v1.5.3
-ff26814d7c5f195ec12ef937eee2d51fde01cc2f v1.5.4
-ef699dd35ae817d0f02ab5cd09a59e0af4211fe4 v1.5.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/.travis.yml
new/setuptools_scm-1.8.0/.travis.yml
--- old/setuptools_scm-1.7.0/.travis.yml 2015-06-20 16:02:46.000000000
+0200
+++ new/setuptools_scm-1.8.0/.travis.yml 2015-09-17 22:46:32.000000000
+0200
@@ -1,17 +1,17 @@
language: python
+sudo: false
python:
- - '2.6'
- - '2.7'
- - '3.3'
- - '3.4'
- - nightly
-
-matrix:
- allow_failures:
- - python: nightly
+- '2.6'
+- '2.7'
+- '3.2'
+- '3.3'
+- '3.4'
+- '3.5'
+cache:
+ files:
+ - $HOME/.pip/cache
+ - $Home/.cache/pip
install: pip install tox
-
script:
- - tox -e py
- - tox -e flake8
+- tox -e py-test,flake8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/CHANGELOG.rst
new/setuptools_scm-1.8.0/CHANGELOG.rst
--- old/setuptools_scm-1.7.0/CHANGELOG.rst 2015-08-12 23:35:37.000000000
+0200
+++ new/setuptools_scm-1.8.0/CHANGELOG.rst 2015-09-17 22:48:24.000000000
+0200
@@ -1,3 +1,13 @@
+
+
+v1.8.0
+======
+
+* fix issue with setuptools wrong version warnings being printed to standard
+ out. User is informed now by distutils-warnings.
+* restructure root finding, we now reliably ignore outer scm
+ and prefer PKG-INFO over scm, fixes #43 and #45
+
v1.7.0
======
@@ -45,7 +55,7 @@
* fix file access bug i missed in 1.5
v1.5.0
-=======
+======
* moved setuptools integration related code to own file
* support storing version strings into a module/text file
@@ -70,30 +80,30 @@
* enhance self-use
v1.1.0
-=======
+======
* enable self-use
v1.0.0
-=======
+======
* documentation enhancements
v0.26
-======
+=====
* rename to setuptools_scm
* split into package, add lots of entry points for extension
* pluggable version schemes
v0.25
-======
+=====
* fix pep440 support
this reshuffles the complete code for version guessing
v0.24
-======
+=====
* dont drop dirty flag on node finding
* fix distance for dirty flagged versions
@@ -120,19 +130,19 @@
use samefile since it does path normalisation
v0.21
-======
+=====
* fix the own version attribute (thanks stefan)
v0.20
-======
+=====
* fix issue 11: always take git describe long format
to avoid the source of the ambiguity
* fix issue 12: add a __version__ attribute via pkginfo
v0.19
-=======
+=====
* configurable next version guessing
* fix distance guessing (thanks stefan)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/PKG-INFO
new/setuptools_scm-1.8.0/PKG-INFO
--- old/setuptools_scm-1.7.0/PKG-INFO 2015-08-12 23:37:01.000000000 +0200
+++ new/setuptools_scm-1.8.0/PKG-INFO 2015-09-17 23:00:09.000000000 +0200
@@ -1,23 +1,22 @@
Metadata-Version: 1.1
Name: setuptools_scm
-Version: 1.7.0
+Version: 1.8.0
Summary: the blessed package to manage your versions by scm tags
Home-page: https://github.com/pypa/setuptools_scm/
Author: Ronny Pfannschmidt
Author-email: [email protected]
License: MIT
-Description: .. warning::
-
- this was moved to https://github.com/pypa/setuptools_scm
-
-
- setuptools_scm
+Description: setuptools_scm
===============
:code:`setuptools_scm` handles managing your python package versions
- in scm metadata.
- It also handles file finders for the suppertes scm's
+ in scm metadata instead of declaring them as the version argument
+ or in a scm managed file.
+
+ It also handles file finders for the supperted scm's.
+ .. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master
+ :target: https://travis-ci.org/pypa/setuptools_scm
Setup.py usage
--------------
@@ -222,6 +221,16 @@
return {'local_scheme': clean_scheme}
+
+ Code of Conduct
+ ---------------
+
+ Everyone interacting in the setuptools_scm project's codebases, issue
trackers,
+ chat rooms, and mailing lists is expected to follow the
+ `PyPA Code of Conduct`_.
+
+ .. _PyPA Code of Conduct:
https://www.pypa.io/en/latest/code-of-conduct/
+
Platform: UNKNOWN
Classifier: Development Status :: 4 - Beta
Classifier: Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/README.rst
new/setuptools_scm-1.8.0/README.rst
--- old/setuptools_scm-1.7.0/README.rst 2015-08-12 23:33:07.000000000 +0200
+++ new/setuptools_scm-1.8.0/README.rst 2015-09-17 22:49:11.000000000 +0200
@@ -1,15 +1,14 @@
-.. warning::
-
- this was moved to https://github.com/pypa/setuptools_scm
-
-
setuptools_scm
===============
:code:`setuptools_scm` handles managing your python package versions
-in scm metadata.
-It also handles file finders for the suppertes scm's
+in scm metadata instead of declaring them as the version argument
+or in a scm managed file.
+
+It also handles file finders for the supperted scm's.
+.. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master
+ :target: https://travis-ci.org/pypa/setuptools_scm
Setup.py usage
--------------
@@ -213,3 +212,13 @@
return dirty_tag(version)
return {'local_scheme': clean_scheme}
+
+
+Code of Conduct
+---------------
+
+Everyone interacting in the setuptools_scm project's codebases, issue trackers,
+chat rooms, and mailing lists is expected to follow the
+`PyPA Code of Conduct`_.
+
+.. _PyPA Code of Conduct: https://www.pypa.io/en/latest/code-of-conduct/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setup.cfg
new/setuptools_scm-1.8.0/setup.cfg
--- old/setuptools_scm-1.7.0/setup.cfg 2015-08-12 23:37:01.000000000 +0200
+++ new/setuptools_scm-1.8.0/setup.cfg 2015-09-17 23:00:09.000000000 +0200
@@ -5,7 +5,7 @@
formats = sdist,bdist_wheel
[egg_info]
-tag_svn_revision = 0
-tag_build =
tag_date = 0
+tag_build =
+tag_svn_revision = 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setup.py
new/setuptools_scm-1.8.0/setup.py
--- old/setuptools_scm-1.7.0/setup.py 2015-08-12 23:37:01.000000000 +0200
+++ new/setuptools_scm-1.8.0/setup.py 2015-09-17 23:00:09.000000000 +0200
@@ -63,7 +63,7 @@
url='https://github.com/pypa/setuptools_scm/',
zip_safe=True,
# pass here since entrypints are not yet registred
- version="1.7.0",
+ version="1.8.0",
author='Ronny Pfannschmidt',
author_email='[email protected]',
description=('the blessed package to manage your versions by scm tags'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/__init__.py
new/setuptools_scm-1.8.0/setuptools_scm/__init__.py
--- old/setuptools_scm-1.7.0/setuptools_scm/__init__.py 2015-08-12
23:31:07.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/__init__.py 2015-09-17
22:43:47.000000000 +0200
@@ -31,7 +31,9 @@
"setuptools-scm was unable to detect version for %r.\n\n"
"Make sure you're not using GitHub's tarballs (or similar ones), as "
"those don't contain the necessary metadata. Use PyPI's tarballs "
- "instead." % root)
+ "instead.\n\nFor example, if you're using pip, instead of "
+ "https://github.com/user/proj/archive/master.zip "
+ "use git+https://github.com/user/proj.git#egg=proj"; % root)
def dump_version(root, version, write_to, template=None):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/git.py
new/setuptools_scm-1.8.0/setuptools_scm/git.py
--- old/setuptools_scm-1.7.0/setuptools_scm/git.py 2015-06-14
08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/git.py 2015-09-17
22:46:32.000000000 +0200
@@ -1,10 +1,16 @@
-from .utils import do, do_ex
+from .utils import do, do_ex, trace
from .version import meta
+from os.path import abspath, realpath
+
FILES_COMMAND = 'git ls-files'
def parse(root):
+ real_root, _, ret = do_ex('git rev-parse --show-toplevel', root)
+ trace('real root', real_root)
+ if abspath(realpath(real_root)) != abspath(realpath(root)):
+ return
rev_node, _, ret = do_ex('git rev-parse --verify --quiet HEAD', root)
if ret:
return meta('0.0')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/hacks.py
new/setuptools_scm-1.8.0/setuptools_scm/hacks.py
--- old/setuptools_scm-1.7.0/setuptools_scm/hacks.py 2015-06-14
08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/hacks.py 2015-09-17
22:46:32.000000000 +0200
@@ -3,6 +3,7 @@
def parse_pkginfo(root):
+
pkginfo = os.path.join(root, 'PKG-INFO')
trace('pkginfo', pkginfo)
data = data_from_mime(pkginfo)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/hg.py
new/setuptools_scm-1.8.0/setuptools_scm/hg.py
--- old/setuptools_scm-1.7.0/setuptools_scm/hg.py 2015-06-14
08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/hg.py 2015-09-17
22:46:32.000000000 +0200
@@ -44,7 +44,6 @@
def archival_to_version(data):
- """stolen logic from mercurials setup.py"""
trace('data', data)
if 'tag' in data:
return meta(data['tag'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/integration.py
new/setuptools_scm-1.8.0/setuptools_scm/integration.py
--- old/setuptools_scm-1.7.0/setuptools_scm/integration.py 2015-07-22
23:08:49.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/integration.py 2015-09-17
22:46:32.000000000 +0200
@@ -12,6 +12,8 @@
return
if value is True:
value = {}
+ if os.path.exists('PKG-INFO'):
+ value.pop('root', None)
if getattr(value, '__call__', None):
value = value()
dist.metadata.version = get_version(**value)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/utils.py
new/setuptools_scm-1.8.0/setuptools_scm/utils.py
--- old/setuptools_scm-1.7.0/setuptools_scm/utils.py 2015-07-13
19:37:59.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/utils.py 2015-09-17
22:46:32.000000000 +0200
@@ -47,7 +47,7 @@
shlex.split(cmd),
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
- cwd=cwd,
+ cwd=str(cwd),
env=_always_strings(dict(
os.environ,
# disable hgrc processing other than .hg/hgrc
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm/version.py
new/setuptools_scm-1.8.0/setuptools_scm/version.py
--- old/setuptools_scm-1.7.0/setuptools_scm/version.py 2015-06-14
08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm/version.py 2015-09-17
22:46:32.000000000 +0200
@@ -5,6 +5,8 @@
from pkg_resources import iter_entry_points
+from distutils import log
+
try:
from pkg_resources import parse_version, SetuptoolsVersion
except ImportError as e:
@@ -13,8 +15,8 @@
def _warn_if_setuptools_outdated():
if parse_version is None:
- print("your setuptools is too old (<12)")
- print("setuptools_scm functionality is degraded")
+ log.warn("your setuptools is too old (<12)")
+ log.warn("setuptools_scm functionality is degraded")
def callable_or_entrypoint(group, callable_or_name):
@@ -71,6 +73,9 @@
tag=self.tag, distance=self.distance,
node=self.node, dirty=self.dirty, extra=self.extra)
+ def format_choice(self, clean_format, dirty_format):
+ return self.format_with(dirty_format if self.dirty else clean_format)
+
def meta(tag, distance=None, dirty=False, node=None, **kw):
if parse_version is not None and not isinstance(tag, SetuptoolsVersion):
@@ -94,29 +99,20 @@
def guess_next_dev_version(version):
if version.exact:
- return version.format_with('{tag}')
+ return version.format_with("{tag}")
else:
return guess_next_version(version.tag, version.distance)
def get_local_node_and_date(version):
if version.exact:
- if version.dirty:
- return version.format_with("+d{time:%Y%m%d}")
- else:
- return ''
+ return version.format_choice("", "+d{time:%Y%m%d}")
else:
- if version.dirty:
- return version.format_with("+n{node}.d{time:%Y%m%d}")
- else:
- return version.format_with("+n{node}")
+ return version.format_choice("+n{node}", "+n{node}.d{time:%Y%m%d}")
def get_local_dirty_tag(version):
- if version.dirty:
- return '+dirty'
- else:
- return ''
+ return version.format_choice('', '+dirty')
def postrelease_version(version):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools_scm-1.7.0/setuptools_scm.egg-info/PKG-INFO
new/setuptools_scm-1.8.0/setuptools_scm.egg-info/PKG-INFO
--- old/setuptools_scm-1.7.0/setuptools_scm.egg-info/PKG-INFO 2015-08-12
23:37:01.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm.egg-info/PKG-INFO 2015-09-17
23:00:09.000000000 +0200
@@ -1,23 +1,22 @@
Metadata-Version: 1.1
Name: setuptools-scm
-Version: 1.7.0
+Version: 1.8.0
Summary: the blessed package to manage your versions by scm tags
Home-page: https://github.com/pypa/setuptools_scm/
Author: Ronny Pfannschmidt
Author-email: [email protected]
License: MIT
-Description: .. warning::
-
- this was moved to https://github.com/pypa/setuptools_scm
-
-
- setuptools_scm
+Description: setuptools_scm
===============
:code:`setuptools_scm` handles managing your python package versions
- in scm metadata.
- It also handles file finders for the suppertes scm's
+ in scm metadata instead of declaring them as the version argument
+ or in a scm managed file.
+
+ It also handles file finders for the supperted scm's.
+ .. image:: https://travis-ci.org/pypa/setuptools_scm.svg?branch=master
+ :target: https://travis-ci.org/pypa/setuptools_scm
Setup.py usage
--------------
@@ -222,6 +221,16 @@
return {'local_scheme': clean_scheme}
+
+ Code of Conduct
+ ---------------
+
+ Everyone interacting in the setuptools_scm project's codebases, issue
trackers,
+ chat rooms, and mailing lists is expected to follow the
+ `PyPA Code of Conduct`_.
+
+ .. _PyPA Code of Conduct:
https://www.pypa.io/en/latest/code-of-conduct/
+
Platform: UNKNOWN
Classifier: Development Status :: 4 - Beta
Classifier: Intended Audience :: Developers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/setuptools_scm-1.7.0/setuptools_scm.egg-info/SOURCES.txt
new/setuptools_scm-1.8.0/setuptools_scm.egg-info/SOURCES.txt
--- old/setuptools_scm-1.7.0/setuptools_scm.egg-info/SOURCES.txt
2015-08-12 23:37:01.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm.egg-info/SOURCES.txt
2015-09-17 23:00:09.000000000 +0200
@@ -1,6 +1,4 @@
.gitignore
-.hgignore
-.hgtags
.travis.yml
CHANGELOG.rst
LICENSE
@@ -8,7 +6,6 @@
appveyor.yml
setup.cfg
setup.py
-setuptools_scm.sublime-project
tox.ini
setuptools_scm/__init__.py
setuptools_scm/__main__.py
@@ -27,4 +24,5 @@
setuptools_scm.egg-info/zip-safe
testing/conftest.py
testing/test_basic_api.py
-testing/test_functions.py
\ No newline at end of file
+testing/test_functions.py
+testing/test_regressions.py
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/setuptools_scm.sublime-project
new/setuptools_scm-1.8.0/setuptools_scm.sublime-project
--- old/setuptools_scm-1.7.0/setuptools_scm.sublime-project 2015-06-14
08:39:53.000000000 +0200
+++ new/setuptools_scm-1.8.0/setuptools_scm.sublime-project 1970-01-01
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-{
- "folders":
- [
- {
- "follow_symlinks": true,
- "path": "."
- }
- ]
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/testing/test_basic_api.py
new/setuptools_scm-1.8.0/testing/test_basic_api.py
--- old/setuptools_scm-1.7.0/testing/test_basic_api.py 2015-06-20
16:02:46.000000000 +0200
+++ new/setuptools_scm-1.8.0/testing/test_basic_api.py 2015-09-17
22:46:32.000000000 +0200
@@ -33,7 +33,7 @@
self.cwd = cwd
def __call__(self, cmd):
- do(cmd, str(self.cwd))
+ return do(cmd, self.cwd)
def write(self, name, value):
filename = self.cwd.join(name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/testing/test_regressions.py
new/setuptools_scm-1.8.0/testing/test_regressions.py
--- old/setuptools_scm-1.7.0/testing/test_regressions.py 1970-01-01
01:00:00.000000000 +0100
+++ new/setuptools_scm-1.8.0/testing/test_regressions.py 2015-09-17
22:46:32.000000000 +0200
@@ -0,0 +1,25 @@
+from setuptools_scm.utils import do_ex, do
+
+
+def test_pkginfo_noscmroot(tmpdir, monkeypatch):
+ """if we are indeed a sdist, the root does not apply"""
+ monkeypatch.delenv("SETUPTOOLS_SCM_DEBUG")
+
+ # we should get the version from pkg-info if git is broken
+ p = tmpdir.ensure('sub/package', dir=1)
+ tmpdir.mkdir('.git')
+ p.join('setup.py').write(
+ 'from setuptools import setup;'
+ 'setup(use_scm_version={"root": ".."})')
+
+ _, stderr, ret = do_ex('python setup.py --version', p)
+ assert 'setuptools-scm was unable to detect version for' in stderr
+ assert ret == 1
+
+ p.join("PKG-INFO").write('Version: 1.0')
+ res = do('python setup.py --version', p)
+ assert res == '1.0'
+
+ do('git init', p.dirpath())
+ res = do('python setup.py --version', p)
+ assert res == '1.0'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/setuptools_scm-1.7.0/tox.ini
new/setuptools_scm-1.8.0/tox.ini
--- old/setuptools_scm-1.7.0/tox.ini 2015-08-08 07:47:52.000000000 +0200
+++ new/setuptools_scm-1.8.0/tox.ini 2015-09-17 22:57:25.000000000 +0200
@@ -1,8 +1,8 @@
[tox]
-envlist=py{27,33,34},flake8
+envlist=py{27,34}-test,flake8
[flake8]
-max-complexity= 10
+max-complexity = 10
[testenv]
@@ -11,11 +11,10 @@
py==1.4.26
pytest
commands=
- py.test [] \
- --junitxml={envlogdir}/junit-{envname}.xml
-
+ test: py.test []
[testenv:flake8]
+skip_install=True
deps=
flake8
mccabe
@@ -31,26 +30,30 @@
rst2html.py README.rst {envlogdir}/README.html --strict []
[testenv:upload]
-deps= wheel
-whitelist_externals = rm
+deps=
+ wheel
+ twine
commands=
- rm -rf {toxinidir}/build {toxinidir}/dist
+ python setup.py clean --all rotate -k - -m .whl,.tar.gz,.zip
python setup.py -q egg_info
- python setup.py -q sdist bdist_wheel register upload
+ python setup.py -q sdist --formats zip bdist_wheel register
+
[testenv:dist]
deps= wheel
whitelist_externals = rm
commands=
- rm -rf {toxinidir}/build {toxinidir}/dist
+ python setup.py -q clean --all
+ python setup.py -q rotate -k 0 -m .egg,.zip,.whl,.tar.gz
python setup.py -q egg_info
- python setup.py -q sdist bdist_wheel --quiet
-
+ python setup.py -q sdist --formats zip,bztar bdist_wheel upload
[testenv:devpi]
deps=
devpi-client
-commands = devpi upload --from-dir dist
+commands =
+ python setup.py -q egg_info
+ devpi upload --from-dir dist
#XXX: envs for hg versions
