Hello community, here is the log from the commit of package python-ecdsa for openSUSE:Factory checked in at 2015-02-24 13:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ecdsa (Old) and /work/SRC/openSUSE:Factory/.python-ecdsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ecdsa" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ecdsa/python-ecdsa.changes 2014-09-17 17:25:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ecdsa.new/python-ecdsa.changes 2015-02-24 13:07:01.000000000 +0100 @@ -1,0 +2,16 @@ +Sat Feb 21 01:31:36 UTC 2015 - prusnak@opensuse.org + +- update to 0.13 + + Fix the argument order for Curve constructor (put openssl_name= at the end, + with a default value) to unbreak compatibility with external callers who used + the 0.11 convention. + +* update to 0.12 + + Switch to Versioneer for version-string management (fixing the broken + `ecdsa.__version__` attribute). Add Curve.openssl_name property. Mention + secp256k1 in README, test against OpenSSL. Produce "wheel" distributions. Add + py3.4 and pypy3 compatibility testing. Other minor fixes. + +------------------------------------------------------------------- Old: ---- ecdsa-0.11.tar.gz New: ---- ecdsa-0.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ecdsa.spec ++++++ --- /var/tmp/diff_new_pack.CQIPFx/_old 2015-02-24 13:07:02.000000000 +0100 +++ /var/tmp/diff_new_pack.CQIPFx/_new 2015-02-24 13:07:02.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-ecdsa # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products 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,7 +17,7 @@ Name: python-ecdsa -Version: 0.11 +Version: 0.13 Release: 0 Summary: ECDSA cryptographic signature library (pure python) License: MIT ++++++ ecdsa-0.11.tar.gz -> ecdsa-0.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/MANIFEST.in new/ecdsa-0.13/MANIFEST.in --- old/ecdsa-0.11/MANIFEST.in 2013-10-02 01:50:50.000000000 +0200 +++ new/ecdsa-0.13/MANIFEST.in 2015-02-04 11:02:21.000000000 +0100 @@ -1,2 +1,3 @@ # basic metadata -include MANIFEST.in LICENSE NEWS README.md +include MANIFEST.in LICENSE NEWS README.md versioneer.py +include ecdsa/_version.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/NEWS new/ecdsa-0.13/NEWS --- old/ecdsa-0.11/NEWS 2014-03-10 23:49:39.000000000 +0100 +++ new/ecdsa-0.13/NEWS 2015-02-07 19:18:55.000000000 +0100 @@ -1,3 +1,16 @@ +* Release 0.13 (07 Feb 2015) + +Fix the argument order for Curve constructor (put openssl_name= at the end, +with a default value) to unbreak compatibility with external callers who used +the 0.11 convention. + +* Release 0.12 (06 Feb 2015) + +Switch to Versioneer for version-string management (fixing the broken +`ecdsa.__version__` attribute). Add Curve.openssl_name property. Mention +secp256k1 in README, test against OpenSSL. Produce "wheel" distributions. Add +py3.4 and pypy3 compatibility testing. Other minor fixes. + * Release 0.11 (10 Mar 2014) Add signature-encoding functions "sigencode_{strings,string,der}_canonize" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/PKG-INFO new/ecdsa-0.13/PKG-INFO --- old/ecdsa-0.11/PKG-INFO 2014-03-10 23:54:24.000000000 +0100 +++ new/ecdsa-0.13/PKG-INFO 2015-02-07 19:26:16.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: ecdsa -Version: 0.11 +Version: 0.13 Summary: ECDSA cryptographic signature library (pure python) Home-page: http://github.com/warner/python-ecdsa Author: Brian Warner @@ -15,3 +15,4 @@ Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.2 Classifier: Programming Language :: Python :: 3.3 +Classifier: Programming Language :: Python :: 3.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/README.md new/ecdsa-0.13/README.md --- old/ecdsa-0.11/README.md 2014-02-17 21:48:01.000000000 +0100 +++ new/ecdsa-0.13/README.md 2015-02-06 22:14:49.000000000 +0100 @@ -1,6 +1,8 @@ # Pure-Python ECDSA [](http://travis-ci.org/warner/python-ecdsa) +[](https://coveralls.io/r/warner/python-ecdsa) +[](https://pypi.python.org/pypi/ecdsa/) This is an easy-to-use implementation of ECDSA cryptography (Elliptic Curve @@ -15,8 +17,10 @@ This library provides key generation, signing, and verifying, for five popular NIST "Suite B" GF(p) curves, with key lengths of 192, 224, 256, 384, and 521 bits. The "short names" for these curves, as known by the OpenSSL -tool, are: prime192v1, secp224r1, prime256v1, secp384r1, and secp521r1. No -other curves are included, but it would not be too hard to add more. +tool (`openssl ecparam --list_curves`), are: prime192v1, secp224r1, +prime256v1, secp384r1, and secp521r1. It also includes the 256-bit curve used +by Bitcoin, whose short name is secp256k1. No other curves are included, but +it would not be too hard to add more. ## Dependencies @@ -33,7 +37,7 @@ (keygen=), to sign data (sign=), and to verify those signatures (verify=), on my 2008 Mac laptop. All times are in seconds. It also shows the length of a signature (in bytes): the verifying ("public") key is typically the same -length as the signature, and the signing ("private") key is half that length. +length as the signature, and the signing ("private") key is half that length. Use "python setup.py speed" to generate this table on your own computer. * NIST192p: siglen= 48, keygen=0.160s, sign=0.058s, verify=0.116s * NIST224p: siglen= 56, keygen=0.230s, sign=0.086s, verify=0.165s @@ -68,12 +72,9 @@ There are four test suites, three for the original Pearson module, and one more for the wrapper. To run them all, do this: - python ecdsa/numbertheory.py # look for "****" and "failed" for problems - python ecdsa/ellipticcurve.py # look for "Bad" for problems - python ecdsa/ecdsa.py # look for "****" and "failed" for problems - python ecdsa/test_pyecdsa.py # look for "FAILED" for problems + python setup.py test -On my 2009 Mac laptop, the combined tests take about 34 seconds to run. On a +On my 2014 Mac Mini, the combined tests take about 20 seconds to run. On a 2.4GHz P4 Linux box, they take 81 seconds. One component of `test_pyecdsa.py` checks compatibility with OpenSSL, by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/__init__.py new/ecdsa-0.13/ecdsa/__init__.py --- old/ecdsa-0.11/ecdsa/__init__.py 2013-10-23 20:28:18.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/__init__.py 2015-02-04 11:02:21.000000000 +0100 @@ -9,9 +9,6 @@ # This code comes from http://github.com/warner/python-ecdsa -try: - from _version import __version__ as v - __version__ = v - del v -except ImportError: - __version__ = "UNKNOWN" +from ._version import get_versions +__version__ = get_versions()['version'] +del get_versions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/_version.py new/ecdsa-0.13/ecdsa/_version.py --- old/ecdsa-0.11/ecdsa/_version.py 2014-03-10 23:54:24.000000000 +0100 +++ new/ecdsa-0.13/ecdsa/_version.py 2015-02-07 19:26:16.000000000 +0100 @@ -1,5 +1,11 @@ -# This file is originally generated from Git information by running 'setup.py -# version'. Distribution tarballs contain a pre-generated copy of this file. +# This file was generated by 'versioneer.py' (0.12) from +# revision-control system data, or from the parent directory name of an +# unpacked source archive. Distribution tarballs contain a pre-generated copy +# of this file. + +version_version = '0.13' +version_full = '5a6fc047222cf21ad89f6cbf8782d0f1e3ddacda' +def get_versions(default={}, verbose=False): + return {'version': version_version, 'full': version_full} -__version__ = '0.11' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/curves.py new/ecdsa-0.13/ecdsa/curves.py --- old/ecdsa-0.11/ecdsa/curves.py 2013-10-02 01:13:25.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/curves.py 2015-02-07 19:16:22.000000000 +0100 @@ -10,8 +10,9 @@ # the NIST curves class Curve: - def __init__(self, name, curve, generator, oid): + def __init__(self, name, curve, generator, oid, openssl_name=None): self.name = name + self.openssl_name = openssl_name # maybe None self.curve = curve self.generator = generator self.order = generator.order() @@ -22,18 +23,17 @@ self.encoded_oid = der.encode_oid(*oid) NIST192p = Curve("NIST192p", ecdsa.curve_192, ecdsa.generator_192, - (1, 2, 840, 10045, 3, 1, 1)) + (1, 2, 840, 10045, 3, 1, 1), "prime192v1") NIST224p = Curve("NIST224p", ecdsa.curve_224, ecdsa.generator_224, - (1, 3, 132, 0, 33)) + (1, 3, 132, 0, 33), "secp224r1") NIST256p = Curve("NIST256p", ecdsa.curve_256, ecdsa.generator_256, - (1, 2, 840, 10045, 3, 1, 7)) + (1, 2, 840, 10045, 3, 1, 7), "prime256v1") NIST384p = Curve("NIST384p", ecdsa.curve_384, ecdsa.generator_384, - (1, 3, 132, 0, 34)) + (1, 3, 132, 0, 34), "secp384r1") NIST521p = Curve("NIST521p", ecdsa.curve_521, ecdsa.generator_521, - (1, 3, 132, 0, 35)) -SECP256k1 = Curve("SECP256k1", - ecdsa.curve_secp256k1, ecdsa.generator_secp256k1, - (1, 3, 132, 0, 10)) + (1, 3, 132, 0, 35), "secp521r1") +SECP256k1 = Curve("SECP256k1", ecdsa.curve_secp256k1, ecdsa.generator_secp256k1, + (1, 3, 132, 0, 10), "secp256k1") curves = [NIST192p, NIST224p, NIST256p, NIST384p, NIST521p, SECP256k1] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/der.py new/ecdsa-0.13/ecdsa/der.py --- old/ecdsa-0.11/ecdsa/der.py 2013-10-02 01:13:25.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/der.py 2015-02-04 11:02:21.000000000 +0100 @@ -2,7 +2,7 @@ import binascii import base64 -from .six import int2byte, b, PY3, integer_types, text_type +from .six import int2byte, b, integer_types, text_type class UnexpectedDER(Exception): pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/keys.py new/ecdsa-0.13/ecdsa/keys.py --- old/ecdsa-0.11/ecdsa/keys.py 2014-03-10 23:45:22.000000000 +0100 +++ new/ecdsa-0.13/ecdsa/keys.py 2015-02-04 11:02:21.000000000 +0100 @@ -232,7 +232,8 @@ See RFC 6979 for more details. """ secexp = self.privkey.secret_multiplier - k = rfc6979.generate_k(self.curve.generator, secexp, hashfunc, digest) + k = rfc6979.generate_k( + self.curve.generator.order(), secexp, hashfunc, digest) return self.sign_digest(digest, sigencode=sigencode, k=k) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/numbertheory.py new/ecdsa-0.13/ecdsa/numbertheory.py --- old/ecdsa-0.11/ecdsa/numbertheory.py 2013-10-02 01:41:06.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/numbertheory.py 2015-02-04 11:02:21.000000000 +0100 @@ -15,7 +15,6 @@ from .six.moves import reduce import math -import types class Error( Exception ): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/rfc6979.py new/ecdsa-0.13/ecdsa/rfc6979.py --- old/ecdsa-0.11/ecdsa/rfc6979.py 2013-10-02 01:40:27.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/rfc6979.py 2015-02-04 11:02:51.000000000 +0100 @@ -51,18 +51,18 @@ return number_to_string_crop(z2, order) # https://tools.ietf.org/html/rfc6979#section-3.2 -def generate_k(generator, secexp, hash_func, data): +def generate_k(order, secexp, hash_func, data): ''' - generator - ECDSA generator used in the signature + order - order of the DSA generator used in the signature secexp - secure exponent (private key) in numeric form hash_func - reference to the same hash function used for generating hash data - hash in binary form of the signing data ''' - qlen = bit_length(generator.order()) + qlen = bit_length(order) holen = hash_func().digest_size rolen = (qlen + 7) / 8 - bx = number_to_string(secexp, generator.order()) + bits2octets(data, generator.order()) + bx = number_to_string(secexp, order) + bits2octets(data, order) # Step B v = b('\x01') * holen @@ -96,7 +96,7 @@ # Step H3 secret = bits2int(t, qlen) - if secret >= 1 and secret < generator.order(): + if secret >= 1 and secret < order: return secret k = hmac.new(k, v+b('\x00'), hash_func).digest() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/test_pyecdsa.py new/ecdsa-0.13/ecdsa/test_pyecdsa.py --- old/ecdsa-0.11/ecdsa/test_pyecdsa.py 2013-10-02 01:31:28.000000000 +0200 +++ new/ecdsa-0.13/ecdsa/test_pyecdsa.py 2015-02-07 19:16:22.000000000 +0100 @@ -57,7 +57,8 @@ priv = SigningKey.from_secret_exponent(secexp, SECP256k1, sha256) pub = priv.get_verifying_key() - k = rfc6979.generate_k(SECP256k1.generator, secexp, sha256, sha256(data).digest()) + k = rfc6979.generate_k( + SECP256k1.generator.order(), secexp, sha256, sha256(data).digest()) sig1 = priv.sign(data, k=k) self.assertTrue(pub.verify(sig1, data)) @@ -245,7 +246,7 @@ badpub = VerifyingKey.from_der(pub1_der) class FakeGenerator: def order(self): return 123456789 - badcurve = Curve("unknown", None, FakeGenerator(), (1,2,3,4,5,6)) + badcurve = Curve("unknown", None, FakeGenerator(), (1,2,3,4,5,6), None) badpub.curve = badcurve badder = badpub.to_der() self.assertRaises(UnknownCurveError, VerifyingKey.from_der, badder) @@ -331,15 +332,21 @@ # sig: 5:OpenSSL->python 6:python->OpenSSL def test_from_openssl_nist192p(self): - return self.do_test_from_openssl(NIST192p, "prime192v1") + return self.do_test_from_openssl(NIST192p) def test_from_openssl_nist224p(self): - return self.do_test_from_openssl(NIST224p, "secp224r1") + return self.do_test_from_openssl(NIST224p) + def test_from_openssl_nist256p(self): + return self.do_test_from_openssl(NIST256p) def test_from_openssl_nist384p(self): - return self.do_test_from_openssl(NIST384p, "secp384r1") + return self.do_test_from_openssl(NIST384p) def test_from_openssl_nist521p(self): - return self.do_test_from_openssl(NIST521p, "secp521r1") - - def do_test_from_openssl(self, curve, curvename): + return self.do_test_from_openssl(NIST521p) + def test_from_openssl_secp256k1(self): + return self.do_test_from_openssl(SECP256k1) + + def do_test_from_openssl(self, curve): + curvename = curve.openssl_name + assert curvename # OpenSSL: create sk, vk, sign. # Python: read vk(3), checksig(5), read sk(1), sign, check mdarg = self.get_openssl_messagedigest_arg() @@ -364,15 +371,21 @@ self.assertTrue(vk.verify(sig, data)) def test_to_openssl_nist192p(self): - self.do_test_to_openssl(NIST192p, "prime192v1") + self.do_test_to_openssl(NIST192p) def test_to_openssl_nist224p(self): - self.do_test_to_openssl(NIST224p, "secp224r1") + self.do_test_to_openssl(NIST224p) + def test_to_openssl_nist256p(self): + self.do_test_to_openssl(NIST256p) def test_to_openssl_nist384p(self): - self.do_test_to_openssl(NIST384p, "secp384r1") + self.do_test_to_openssl(NIST384p) def test_to_openssl_nist521p(self): - self.do_test_to_openssl(NIST521p, "secp521r1") - - def do_test_to_openssl(self, curve, curvename): + self.do_test_to_openssl(NIST521p) + def test_to_openssl_secp256k1(self): + self.do_test_to_openssl(SECP256k1) + + def do_test_to_openssl(self, curve): + curvename = curve.openssl_name + assert curvename # Python: create sk, vk, sign. # OpenSSL: read vk(4), checksig(6), read sk(2), sign, check mdarg = self.get_openssl_messagedigest_arg() @@ -510,7 +523,7 @@ class RFC6979(unittest.TestCase): # https://tools.ietf.org/html/rfc6979#appendix-A.1 def _do(self, generator, secexp, hsh, hash_func, expected): - actual = rfc6979.generate_k(generator, secexp, hash_func, hsh) + actual = rfc6979.generate_k(generator.order(), secexp, hash_func, hsh) self.assertEqual(expected, actual) def test_SECP256k1(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/ecdsa/util.py new/ecdsa-0.13/ecdsa/util.py --- old/ecdsa-0.11/ecdsa/util.py 2014-03-10 23:45:10.000000000 +0100 +++ new/ecdsa-0.13/ecdsa/util.py 2015-02-04 11:02:21.000000000 +0100 @@ -28,7 +28,7 @@ Note that this function is not declared to be forwards-compatible: we may change the behavior in future releases. The entropy= argument (which - should get a callable that behaves like os.entropy) can be used to + should get a callable that behaves like os.urandom) can be used to achieve stability within a given release (for repeatable unit tests), but should not be used as a long-term-compatible key generation algorithm. """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/setup.cfg new/ecdsa-0.13/setup.cfg --- old/ecdsa-0.11/setup.cfg 1970-01-01 01:00:00.000000000 +0100 +++ new/ecdsa-0.13/setup.cfg 2015-02-04 11:02:21.000000000 +0100 @@ -0,0 +1,2 @@ +[wheel] +universal = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/setup.py new/ecdsa-0.13/setup.py --- old/ecdsa-0.11/setup.py 2014-02-17 21:48:01.000000000 +0100 +++ new/ecdsa-0.13/setup.py 2015-02-04 11:02:21.000000000 +0100 @@ -1,8 +1,20 @@ #!/usr/bin/env python -import os, subprocess, re -from distutils.core import setup, Command -from distutils.command.sdist import sdist as _sdist -from ecdsa.six import print_ +try: + # try setuptools, so devs can run bdist_wheel + from setuptools import setup, Command +except ImportError: + # but most users really don't require it + from distutils.core import setup, Command +import timeit + +import versioneer +versioneer.versionfile_source = "ecdsa/_version.py" +versioneer.versionfile_build = versioneer.versionfile_source +versioneer.tag_prefix = "python-ecdsa-" +versioneer.parentdir_prefix = "ecdsa-" +versioneer.VCS = "git" + +commands = versioneer.get_cmdclass().copy() class Test(Command): description = "run unit tests" @@ -22,78 +34,56 @@ from ecdsa import test_pyecdsa test_pyecdsa.unittest.main(module=test_pyecdsa, argv=["dummy"]) # all tests os.exit(1) upon failure +commands["test"] = Test -VERSION_PY = """ -# This file is originally generated from Git information by running 'setup.py -# version'. Distribution tarballs contain a pre-generated copy of this file. - -__version__ = '%s' -""" - -def update_version_py(): - if not os.path.isdir(".git"): - print_("This does not appear to be a Git repository.") - return - try: - p = subprocess.Popen(["git", "describe", - "--tags", "--dirty", "--always"], - stdout=subprocess.PIPE) - except EnvironmentError: - print_("unable to run git, leaving ecdsa/_version.py alone") - return - stdout = p.communicate()[0] - if p.returncode != 0: - print_("unable to run git, leaving ecdsa/_version.py alone") - return - # we use tags like "python-ecdsa-0.5", so strip the prefix - assert stdout.startswith("python-ecdsa-") - ver = stdout[len("python-ecdsa-"):].strip() - f = open("ecdsa/_version.py", "w") - f.write(VERSION_PY % ver) - f.close() - print_("set ecdsa/_version.py to '%s'" % ver) - -def get_version(): - try: - f = open("ecdsa/_version.py") - except EnvironmentError: - return None - for line in f.readlines(): - mo = re.match("__version__ = '([^']+)'", line) - if mo: - ver = mo.group(1) - return ver - return None - -class Version(Command): - description = "update _version.py from Git repo" - user_options = [] - boolean_options = [] - def initialize_options(self): - pass - def finalize_options(self): - pass +class Speed(Test): + description = "run benchmark suite" def run(self): - update_version_py() - print_("Version is now", get_version()) + def do(setup_statements, statement): + # extracted from timeit.py + t = timeit.Timer(stmt=statement, + setup="\n".join(setup_statements)) + # determine number so that 0.2 <= total time < 2.0 + for i in range(1, 10): + number = 10**i + x = t.timeit(number) + if x >= 0.2: + break + return x / number + + for curve in ["NIST192p", "NIST224p", "NIST256p", "SECP256k1", + "NIST384p", "NIST521p"]: + S1 = "from ecdsa import six, SigningKey, %s" % curve + S2 = "sk = SigningKey.generate(%s)" % curve + S3 = "msg = six.b('msg')" + S4 = "sig = sk.sign(msg)" + S5 = "vk = sk.get_verifying_key()" + S6 = "vk.verify(sig, msg)" + # We happen to know that .generate() also calculates the + # verifying key, which is the time-consuming part. If the code + # were changed to lazily calculate vk, we'd need to change this + # benchmark to loop over S5 instead of S2 + keygen = do([S1], S2) + sign = do([S1,S2,S3], S4) + verf = do([S1,S2,S3,S4,S5], S6) + import ecdsa + c = getattr(ecdsa, curve) + sig = ecdsa.SigningKey.generate(c).sign(ecdsa.six.b("msg")) + print("%9s: siglen=%3d, keygen=%.3fs, sign=%.3fs, verify=%.3fs" \ + % (curve, len(sig), keygen, sign, verf)) + +commands["speed"] = Speed -class sdist(_sdist): - def run(self): - update_version_py() - # unless we update this, the sdist command will keep using the old - # version - self.distribution.metadata.version = get_version() - return _sdist.run(self) setup(name="ecdsa", - version=get_version(), + version=versioneer.get_version(), description="ECDSA cryptographic signature library (pure python)", author="Brian Warner", author_email="warner-pyecdsa@lothar.com", url="http://github.com/warner/python-ecdsa", packages=["ecdsa"], license="MIT", - cmdclass={ "test": Test, "version": Version, "sdist": sdist }, + cmdclass=commands, classifiers=[ "Programming Language :: Python", "Programming Language :: Python :: 2", @@ -102,5 +92,6 @@ "Programming Language :: Python :: 3", "Programming Language :: Python :: 3.2", "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4", ], ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ecdsa-0.11/versioneer.py new/ecdsa-0.13/versioneer.py --- old/ecdsa-0.11/versioneer.py 1970-01-01 01:00:00.000000000 +0100 +++ new/ecdsa-0.13/versioneer.py 2015-02-04 11:02:21.000000000 +0100 @@ -0,0 +1,901 @@ + +# Version: 0.12 + +""" +The Versioneer +============== + +* like a rocketeer, but for versions! +* https://github.com/warner/python-versioneer +* Brian Warner +* License: Public Domain +* Compatible With: python2.6, 2.7, 3.2, 3.3, 3.4, and pypy + +[](https://travis-ci.org/warner/python-versioneer) + +This is a tool for managing a recorded version number in distutils-based +python projects. The goal is to remove the tedious and error-prone "update +the embedded version string" step from your release process. Making a new +release should be as easy as recording a new tag in your version-control +system, and maybe making new tarballs. + + +## Quick Install + +* `pip install versioneer` to somewhere to your $PATH +* run `versioneer-installer` in your source tree: this installs `versioneer.py` +* follow the instructions below (also in the `versioneer.py` docstring) + +## Version Identifiers + +Source trees come from a variety of places: + +* a version-control system checkout (mostly used by developers) +* a nightly tarball, produced by build automation +* a snapshot tarball, produced by a web-based VCS browser, like github's + "tarball from tag" feature +* a release tarball, produced by "setup.py sdist", distributed through PyPI + +Within each source tree, the version identifier (either a string or a number, +this tool is format-agnostic) can come from a variety of places: + +* ask the VCS tool itself, e.g. "git describe" (for checkouts), which knows + about recent "tags" and an absolute revision-id +* the name of the directory into which the tarball was unpacked +* an expanded VCS keyword ($Id$, etc) +* a `_version.py` created by some earlier build step + +For released software, the version identifier is closely related to a VCS +tag. Some projects use tag names that include more than just the version +string (e.g. "myproject-1.2" instead of just "1.2"), in which case the tool +needs to strip the tag prefix to extract the version identifier. For +unreleased software (between tags), the version identifier should provide +enough information to help developers recreate the same tree, while also +giving them an idea of roughly how old the tree is (after version 1.2, before +version 1.3). Many VCS systems can report a description that captures this, +for example 'git describe --tags --dirty --always' reports things like +"0.7-1-g574ab98-dirty" to indicate that the checkout is one revision past the +0.7 tag, has a unique revision id of "574ab98", and is "dirty" (it has +uncommitted changes. + +The version identifier is used for multiple purposes: + +* to allow the module to self-identify its version: `myproject.__version__` +* to choose a name and prefix for a 'setup.py sdist' tarball + +## Theory of Operation + +Versioneer works by adding a special `_version.py` file into your source +tree, where your `__init__.py` can import it. This `_version.py` knows how to +dynamically ask the VCS tool for version information at import time. However, +when you use "setup.py build" or "setup.py sdist", `_version.py` in the new +copy is replaced by a small static file that contains just the generated +version data. + +`_version.py` also contains `$Revision$` markers, and the installation +process marks `_version.py` to have this marker rewritten with a tag name +during the "git archive" command. As a result, generated tarballs will +contain enough information to get the proper version. + + +## Installation + +First, decide on values for the following configuration variables: + +* `VCS`: the version control system you use. Currently accepts "git". + +* `versionfile_source`: + + A project-relative pathname into which the generated version strings should + be written. This is usually a `_version.py` next to your project's main + `__init__.py` file, so it can be imported at runtime. If your project uses + `src/myproject/__init__.py`, this should be `src/myproject/_version.py`. + This file should be checked in to your VCS as usual: the copy created below + by `setup.py versioneer` will include code that parses expanded VCS + keywords in generated tarballs. The 'build' and 'sdist' commands will + replace it with a copy that has just the calculated version string. + + This must be set even if your project does not have any modules (and will + therefore never import `_version.py`), since "setup.py sdist" -based trees + still need somewhere to record the pre-calculated version strings. Anywhere + in the source tree should do. If there is a `__init__.py` next to your + `_version.py`, the `setup.py versioneer` command (described below) will + append some `__version__`-setting assignments, if they aren't already + present. + +* `versionfile_build`: + + Like `versionfile_source`, but relative to the build directory instead of + the source directory. These will differ when your setup.py uses + 'package_dir='. If you have `package_dir={'myproject': 'src/myproject'}`, + then you will probably have `versionfile_build='myproject/_version.py'` and + `versionfile_source='src/myproject/_version.py'`. + + If this is set to None, then `setup.py build` will not attempt to rewrite + any `_version.py` in the built tree. If your project does not have any + libraries (e.g. if it only builds a script), then you should use + `versionfile_build = None` and override `distutils.command.build_scripts` + to explicitly insert a copy of `versioneer.get_version()` into your + generated script. + +* `tag_prefix`: + + a string, like 'PROJECTNAME-', which appears at the start of all VCS tags. + If your tags look like 'myproject-1.2.0', then you should use + tag_prefix='myproject-'. If you use unprefixed tags like '1.2.0', this + should be an empty string. + +* `parentdir_prefix`: + + a string, frequently the same as tag_prefix, which appears at the start of + all unpacked tarball filenames. If your tarball unpacks into + 'myproject-1.2.0', this should be 'myproject-'. + +This tool provides one script, named `versioneer-installer`. That script does +one thing: write a copy of `versioneer.py` into the current directory. + +To versioneer-enable your project: + +* 1: Run `versioneer-installer` to copy `versioneer.py` into the top of your + source tree. + +* 2: add the following lines to the top of your `setup.py`, with the + configuration values you decided earlier: + + import versioneer + versioneer.VCS = 'git' + versioneer.versionfile_source = 'src/myproject/_version.py' + versioneer.versionfile_build = 'myproject/_version.py' + versioneer.tag_prefix = '' # tags are like 1.2.0 + versioneer.parentdir_prefix = 'myproject-' # dirname like 'myproject-1.2.0' + +* 3: add the following arguments to the setup() call in your setup.py: + + version=versioneer.get_version(), + cmdclass=versioneer.get_cmdclass(), + +* 4: now run `setup.py versioneer`, which will create `_version.py`, and will + modify your `__init__.py` (if one exists next to `_version.py`) to define + `__version__` (by calling a function from `_version.py`). It will also + modify your `MANIFEST.in` to include both `versioneer.py` and the generated + `_version.py` in sdist tarballs. + +* 5: commit these changes to your VCS. To make sure you won't forget, + `setup.py versioneer` will mark everything it touched for addition. + +## Post-Installation Usage + +Once established, all uses of your tree from a VCS checkout should get the +current version string. All generated tarballs should include an embedded +version string (so users who unpack them will not need a VCS tool installed). + +If you distribute your project through PyPI, then the release process should +boil down to two steps: + +* 1: git tag 1.0 +* 2: python setup.py register sdist upload + +If you distribute it through github (i.e. users use github to generate +tarballs with `git archive`), the process is: + +* 1: git tag 1.0 +* 2: git push; git push --tags + +Currently, all version strings must be based upon a tag. Versioneer will +report "unknown" until your tree has at least one tag in its history. This +restriction will be fixed eventually (see issue #12). + +## Version-String Flavors + +Code which uses Versioneer can learn about its version string at runtime by +importing `_version` from your main `__init__.py` file and running the +`get_versions()` function. From the "outside" (e.g. in `setup.py`), you can +import the top-level `versioneer.py` and run `get_versions()`. + +Both functions return a dictionary with different keys for different flavors +of the version string: + +* `['version']`: condensed tag+distance+shortid+dirty identifier. For git, + this uses the output of `git describe --tags --dirty --always` but strips + the tag_prefix. For example "0.11-2-g1076c97-dirty" indicates that the tree + is like the "1076c97" commit but has uncommitted changes ("-dirty"), and + that this commit is two revisions ("-2-") beyond the "0.11" tag. For + released software (exactly equal to a known tag), the identifier will only + contain the stripped tag, e.g. "0.11". + +* `['full']`: detailed revision identifier. For Git, this is the full SHA1 + commit id, followed by "-dirty" if the tree contains uncommitted changes, + e.g. "1076c978a8d3cfc70f408fe5974aa6c092c949ac-dirty". + +Some variants are more useful than others. Including `full` in a bug report +should allow developers to reconstruct the exact code being tested (or +indicate the presence of local changes that should be shared with the +developers). `version` is suitable for display in an "about" box or a CLI +`--version` output: it can be easily compared against release notes and lists +of bugs fixed in various releases. + +In the future, this will also include a +[PEP-0440](http://legacy.python.org/dev/peps/pep-0440/) -compatible flavor +(e.g. `1.2.post0.dev123`). This loses a lot of information (and has no room +for a hash-based revision id), but is safe to use in a `setup.py` +"`version=`" argument. It also enables tools like *pip* to compare version +strings and evaluate compatibility constraint declarations. + +The `setup.py versioneer` command adds the following text to your +`__init__.py` to place a basic version in `YOURPROJECT.__version__`: + + from ._version import get_versions + __version__ = get_versions()['version'] + del get_versions + +## Updating Versioneer + +To upgrade your project to a new release of Versioneer, do the following: + +* install the new Versioneer (`pip install -U versioneer` or equivalent) +* re-run `versioneer-installer` in your source tree to replace your copy of + `versioneer.py` +* edit `setup.py`, if necessary, to include any new configuration settings + indicated by the release notes +* re-run `setup.py versioneer` to replace `SRC/_version.py` +* commit any changed files + +### Upgrading from 0.10 to 0.11 + +You must add a `versioneer.VCS = "git"` to your `setup.py` before re-running +`setup.py versioneer`. This will enable the use of additional version-control +systems (SVN, etc) in the future. + +### Upgrading from 0.11 to 0.12 + +Nothing special. + +## Future Directions + +This tool is designed to make it easily extended to other version-control +systems: all VCS-specific components are in separate directories like +src/git/ . The top-level `versioneer.py` script is assembled from these +components by running make-versioneer.py . In the future, make-versioneer.py +will take a VCS name as an argument, and will construct a version of +`versioneer.py` that is specific to the given VCS. It might also take the +configuration arguments that are currently provided manually during +installation by editing setup.py . Alternatively, it might go the other +direction and include code from all supported VCS systems, reducing the +number of intermediate scripts. + + +## License + +To make Versioneer easier to embed, all its code is hereby released into the +public domain. The `_version.py` that it creates is also in the public +domain. + +""" + +import os, sys, re, subprocess, errno +from distutils.core import Command +from distutils.command.sdist import sdist as _sdist +from distutils.command.build import build as _build + +# these configuration settings will be overridden by setup.py after it +# imports us +versionfile_source = None +versionfile_build = None +tag_prefix = None +parentdir_prefix = None +VCS = None + +# these dictionaries contain VCS-specific tools +LONG_VERSION_PY = {} + +def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): + assert isinstance(commands, list) + p = None + for c in commands: + try: + # remember shell=False, so use git.cmd on windows, not just git + p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, + stderr=(subprocess.PIPE if hide_stderr + else None)) + break + except EnvironmentError: + e = sys.exc_info()[1] + if e.errno == errno.ENOENT: + continue + if verbose: + print("unable to run %s" % args[0]) + print(e) + return None + else: + if verbose: + print("unable to find command, tried %s" % (commands,)) + return None + stdout = p.communicate()[0].strip() + if sys.version >= '3': + stdout = stdout.decode() + if p.returncode != 0: + if verbose: + print("unable to run %s (error)" % args[0]) + return None + return stdout + +LONG_VERSION_PY['git'] = ''' +# This file helps to compute a version number in source trees obtained from +# git-archive tarball (such as those provided by githubs download-from-tag +# feature). Distribution tarballs (built by setup.py sdist) and build +# directories (produced by setup.py build) will contain a much shorter file +# that just contains the computed version number. + +# This file is released into the public domain. Generated by +# versioneer-0.12 (https://github.com/warner/python-versioneer) + +# these strings will be replaced by git during git-archive +git_refnames = "%(DOLLAR)sFormat:%%d%(DOLLAR)s" +git_full = "%(DOLLAR)sFormat:%%H%(DOLLAR)s" + +# these strings are filled in when 'setup.py versioneer' creates _version.py +tag_prefix = "%(TAG_PREFIX)s" +parentdir_prefix = "%(PARENTDIR_PREFIX)s" +versionfile_source = "%(VERSIONFILE_SOURCE)s" + +import os, sys, re, subprocess, errno + +def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False): + assert isinstance(commands, list) + p = None + for c in commands: + try: + # remember shell=False, so use git.cmd on windows, not just git + p = subprocess.Popen([c] + args, cwd=cwd, stdout=subprocess.PIPE, + stderr=(subprocess.PIPE if hide_stderr + else None)) + break + except EnvironmentError: + e = sys.exc_info()[1] + if e.errno == errno.ENOENT: + continue + if verbose: + print("unable to run %%s" %% args[0]) + print(e) + return None + else: + if verbose: + print("unable to find command, tried %%s" %% (commands,)) + return None + stdout = p.communicate()[0].strip() + if sys.version >= '3': + stdout = stdout.decode() + if p.returncode != 0: + if verbose: + print("unable to run %%s (error)" %% args[0]) + return None + return stdout + + +def versions_from_parentdir(parentdir_prefix, root, verbose=False): + # Source tarballs conventionally unpack into a directory that includes + # both the project name and a version string. + dirname = os.path.basename(root) + if not dirname.startswith(parentdir_prefix): + if verbose: + print("guessing rootdir is '%%s', but '%%s' doesn't start with prefix '%%s'" %% + (root, dirname, parentdir_prefix)) + return None + return {"version": dirname[len(parentdir_prefix):], "full": ""} + +def git_get_keywords(versionfile_abs): + # the code embedded in _version.py can just fetch the value of these + # keywords. When used from setup.py, we don't want to import _version.py, + # so we do it with a regexp instead. This function is not used from + # _version.py. + keywords = {} + try: + f = open(versionfile_abs,"r") + for line in f.readlines(): + if line.strip().startswith("git_refnames ="): + mo = re.search(r'=\s*"(.*)"', line) + if mo: + keywords["refnames"] = mo.group(1) + if line.strip().startswith("git_full ="): + mo = re.search(r'=\s*"(.*)"', line) + if mo: + keywords["full"] = mo.group(1) + f.close() + except EnvironmentError: + pass + return keywords + +def git_versions_from_keywords(keywords, tag_prefix, verbose=False): + if not keywords: + return {} # keyword-finding function failed to find keywords + refnames = keywords["refnames"].strip() + if refnames.startswith("$Format"): + if verbose: + print("keywords are unexpanded, not using") + return {} # unexpanded, so not in an unpacked git-archive tarball + refs = set([r.strip() for r in refnames.strip("()").split(",")]) + # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of + # just "foo-1.0". If we see a "tag: " prefix, prefer those. + TAG = "tag: " + tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) + if not tags: + # Either we're using git < 1.8.3, or there really are no tags. We use + # a heuristic: assume all version tags have a digit. The old git %%d + # expansion behaves like git log --decorate=short and strips out the + # refs/heads/ and refs/tags/ prefixes that would let us distinguish + # between branches and tags. By ignoring refnames without digits, we + # filter out many common branch names like "release" and + # "stabilization", as well as "HEAD" and "master". + tags = set([r for r in refs if re.search(r'\d', r)]) + if verbose: + print("discarding '%%s', no digits" %% ",".join(refs-tags)) + if verbose: + print("likely tags: %%s" %% ",".join(sorted(tags))) + for ref in sorted(tags): + # sorting will prefer e.g. "2.0" over "2.0rc1" + if ref.startswith(tag_prefix): + r = ref[len(tag_prefix):] + if verbose: + print("picking %%s" %% r) + return { "version": r, + "full": keywords["full"].strip() } + # no suitable tags, so we use the full revision id + if verbose: + print("no suitable tags, using full revision id") + return { "version": keywords["full"].strip(), + "full": keywords["full"].strip() } + + +def git_versions_from_vcs(tag_prefix, root, verbose=False): + # this runs 'git' from the root of the source tree. This only gets called + # if the git-archive 'subst' keywords were *not* expanded, and + # _version.py hasn't already been rewritten with a short version string, + # meaning we're inside a checked out source tree. + + if not os.path.exists(os.path.join(root, ".git")): + if verbose: + print("no .git in %%s" %% root) + return {} + + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], + cwd=root) + if stdout is None: + return {} + if not stdout.startswith(tag_prefix): + if verbose: + print("tag '%%s' doesn't start with prefix '%%s'" %% (stdout, tag_prefix)) + return {} + tag = stdout[len(tag_prefix):] + stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if stdout is None: + return {} + full = stdout.strip() + if tag.endswith("-dirty"): + full += "-dirty" + return {"version": tag, "full": full} + + +def get_versions(default={"version": "unknown", "full": ""}, verbose=False): + # I am in _version.py, which lives at ROOT/VERSIONFILE_SOURCE. If we have + # __file__, we can work backwards from there to the root. Some + # py2exe/bbfreeze/non-CPython implementations don't do __file__, in which + # case we can only use expanded keywords. + + keywords = { "refnames": git_refnames, "full": git_full } + ver = git_versions_from_keywords(keywords, tag_prefix, verbose) + if ver: + return ver + + try: + root = os.path.abspath(__file__) + # versionfile_source is the relative path from the top of the source + # tree (where the .git directory might live) to this file. Invert + # this to find the root from __file__. + for i in range(len(versionfile_source.split(os.sep))): + root = os.path.dirname(root) + except NameError: + return default + + return (git_versions_from_vcs(tag_prefix, root, verbose) + or versions_from_parentdir(parentdir_prefix, root, verbose) + or default) +''' + +def git_get_keywords(versionfile_abs): + # the code embedded in _version.py can just fetch the value of these + # keywords. When used from setup.py, we don't want to import _version.py, + # so we do it with a regexp instead. This function is not used from + # _version.py. + keywords = {} + try: + f = open(versionfile_abs,"r") + for line in f.readlines(): + if line.strip().startswith("git_refnames ="): + mo = re.search(r'=\s*"(.*)"', line) + if mo: + keywords["refnames"] = mo.group(1) + if line.strip().startswith("git_full ="): + mo = re.search(r'=\s*"(.*)"', line) + if mo: + keywords["full"] = mo.group(1) + f.close() + except EnvironmentError: + pass + return keywords + +def git_versions_from_keywords(keywords, tag_prefix, verbose=False): + if not keywords: + return {} # keyword-finding function failed to find keywords + refnames = keywords["refnames"].strip() + if refnames.startswith("$Format"): + if verbose: + print("keywords are unexpanded, not using") + return {} # unexpanded, so not in an unpacked git-archive tarball + refs = set([r.strip() for r in refnames.strip("()").split(",")]) + # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of + # just "foo-1.0". If we see a "tag: " prefix, prefer those. + TAG = "tag: " + tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)]) + if not tags: + # Either we're using git < 1.8.3, or there really are no tags. We use + # a heuristic: assume all version tags have a digit. The old git %d + # expansion behaves like git log --decorate=short and strips out the + # refs/heads/ and refs/tags/ prefixes that would let us distinguish + # between branches and tags. By ignoring refnames without digits, we + # filter out many common branch names like "release" and + # "stabilization", as well as "HEAD" and "master". + tags = set([r for r in refs if re.search(r'\d', r)]) + if verbose: + print("discarding '%s', no digits" % ",".join(refs-tags)) + if verbose: + print("likely tags: %s" % ",".join(sorted(tags))) + for ref in sorted(tags): + # sorting will prefer e.g. "2.0" over "2.0rc1" + if ref.startswith(tag_prefix): + r = ref[len(tag_prefix):] + if verbose: + print("picking %s" % r) + return { "version": r, + "full": keywords["full"].strip() } + # no suitable tags, so we use the full revision id + if verbose: + print("no suitable tags, using full revision id") + return { "version": keywords["full"].strip(), + "full": keywords["full"].strip() } + + +def git_versions_from_vcs(tag_prefix, root, verbose=False): + # this runs 'git' from the root of the source tree. This only gets called + # if the git-archive 'subst' keywords were *not* expanded, and + # _version.py hasn't already been rewritten with a short version string, + # meaning we're inside a checked out source tree. + + if not os.path.exists(os.path.join(root, ".git")): + if verbose: + print("no .git in %s" % root) + return {} + + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + stdout = run_command(GITS, ["describe", "--tags", "--dirty", "--always"], + cwd=root) + if stdout is None: + return {} + if not stdout.startswith(tag_prefix): + if verbose: + print("tag '%s' doesn't start with prefix '%s'" % (stdout, tag_prefix)) + return {} + tag = stdout[len(tag_prefix):] + stdout = run_command(GITS, ["rev-parse", "HEAD"], cwd=root) + if stdout is None: + return {} + full = stdout.strip() + if tag.endswith("-dirty"): + full += "-dirty" + return {"version": tag, "full": full} + + +def do_vcs_install(manifest_in, versionfile_source, ipy): + GITS = ["git"] + if sys.platform == "win32": + GITS = ["git.cmd", "git.exe"] + files = [manifest_in, versionfile_source] + if ipy: + files.append(ipy) + try: + me = __file__ + if me.endswith(".pyc") or me.endswith(".pyo"): + me = os.path.splitext(me)[0] + ".py" + versioneer_file = os.path.relpath(me) + except NameError: + versioneer_file = "versioneer.py" + files.append(versioneer_file) + present = False + try: + f = open(".gitattributes", "r") + for line in f.readlines(): + if line.strip().startswith(versionfile_source): + if "export-subst" in line.strip().split()[1:]: + present = True + f.close() + except EnvironmentError: + pass + if not present: + f = open(".gitattributes", "a+") + f.write("%s export-subst\n" % versionfile_source) + f.close() + files.append(".gitattributes") + run_command(GITS, ["add", "--"] + files) + +def versions_from_parentdir(parentdir_prefix, root, verbose=False): + # Source tarballs conventionally unpack into a directory that includes + # both the project name and a version string. + dirname = os.path.basename(root) + if not dirname.startswith(parentdir_prefix): + if verbose: + print("guessing rootdir is '%s', but '%s' doesn't start with prefix '%s'" % + (root, dirname, parentdir_prefix)) + return None + return {"version": dirname[len(parentdir_prefix):], "full": ""} + +SHORT_VERSION_PY = """ +# This file was generated by 'versioneer.py' (0.12) from +# revision-control system data, or from the parent directory name of an +# unpacked source archive. Distribution tarballs contain a pre-generated copy +# of this file. + +version_version = '%(version)s' +version_full = '%(full)s' +def get_versions(default={}, verbose=False): + return {'version': version_version, 'full': version_full} + +""" + +DEFAULT = {"version": "unknown", "full": "unknown"} + +def versions_from_file(filename): + versions = {} + try: + with open(filename) as f: + for line in f.readlines(): + mo = re.match("version_version = '([^']+)'", line) + if mo: + versions["version"] = mo.group(1) + mo = re.match("version_full = '([^']+)'", line) + if mo: + versions["full"] = mo.group(1) + except EnvironmentError: + return {} + + return versions + +def write_to_version_file(filename, versions): + with open(filename, "w") as f: + f.write(SHORT_VERSION_PY % versions) + + print("set %s to '%s'" % (filename, versions["version"])) + + +def get_root(): + try: + return os.path.dirname(os.path.abspath(__file__)) + except NameError: + return os.path.dirname(os.path.abspath(sys.argv[0])) + +def vcs_function(vcs, suffix): + return getattr(sys.modules[__name__], '%s_%s' % (vcs, suffix), None) + +def get_versions(default=DEFAULT, verbose=False): + # returns dict with two keys: 'version' and 'full' + assert versionfile_source is not None, "please set versioneer.versionfile_source" + assert tag_prefix is not None, "please set versioneer.tag_prefix" + assert parentdir_prefix is not None, "please set versioneer.parentdir_prefix" + assert VCS is not None, "please set versioneer.VCS" + + # I am in versioneer.py, which must live at the top of the source tree, + # which we use to compute the root directory. py2exe/bbfreeze/non-CPython + # don't have __file__, in which case we fall back to sys.argv[0] (which + # ought to be the setup.py script). We prefer __file__ since that's more + # robust in cases where setup.py was invoked in some weird way (e.g. pip) + root = get_root() + versionfile_abs = os.path.join(root, versionfile_source) + + # extract version from first of _version.py, VCS command (e.g. 'git + # describe'), parentdir. This is meant to work for developers using a + # source checkout, for users of a tarball created by 'setup.py sdist', + # and for users of a tarball/zipball created by 'git archive' or github's + # download-from-tag feature or the equivalent in other VCSes. + + get_keywords_f = vcs_function(VCS, "get_keywords") + versions_from_keywords_f = vcs_function(VCS, "versions_from_keywords") + if get_keywords_f and versions_from_keywords_f: + vcs_keywords = get_keywords_f(versionfile_abs) + ver = versions_from_keywords_f(vcs_keywords, tag_prefix) + if ver: + if verbose: print("got version from expanded keyword %s" % ver) + return ver + + ver = versions_from_file(versionfile_abs) + if ver: + if verbose: print("got version from file %s %s" % (versionfile_abs,ver)) + return ver + + versions_from_vcs_f = vcs_function(VCS, "versions_from_vcs") + if versions_from_vcs_f: + ver = versions_from_vcs_f(tag_prefix, root, verbose) + if ver: + if verbose: print("got version from VCS %s" % ver) + return ver + + ver = versions_from_parentdir(parentdir_prefix, root, verbose) + if ver: + if verbose: print("got version from parentdir %s" % ver) + return ver + + if verbose: print("got version from default %s" % default) + return default + +def get_version(verbose=False): + return get_versions(verbose=verbose)["version"] + +class cmd_version(Command): + description = "report generated version string" + user_options = [] + boolean_options = [] + def initialize_options(self): + pass + def finalize_options(self): + pass + def run(self): + ver = get_version(verbose=True) + print("Version is currently: %s" % ver) + + +class cmd_build(_build): + def run(self): + versions = get_versions(verbose=True) + _build.run(self) + # now locate _version.py in the new build/ directory and replace it + # with an updated value + if versionfile_build: + target_versionfile = os.path.join(self.build_lib, versionfile_build) + print("UPDATING %s" % target_versionfile) + os.unlink(target_versionfile) + with open(target_versionfile, "w") as f: + f.write(SHORT_VERSION_PY % versions) + +if 'cx_Freeze' in sys.modules: # cx_freeze enabled? + from cx_Freeze.dist import build_exe as _build_exe + + class cmd_build_exe(_build_exe): + def run(self): + versions = get_versions(verbose=True) + target_versionfile = versionfile_source + print("UPDATING %s" % target_versionfile) + os.unlink(target_versionfile) + with open(target_versionfile, "w") as f: + f.write(SHORT_VERSION_PY % versions) + + _build_exe.run(self) + os.unlink(target_versionfile) + with open(versionfile_source, "w") as f: + assert VCS is not None, "please set versioneer.VCS" + LONG = LONG_VERSION_PY[VCS] + f.write(LONG % {"DOLLAR": "$", + "TAG_PREFIX": tag_prefix, + "PARENTDIR_PREFIX": parentdir_prefix, + "VERSIONFILE_SOURCE": versionfile_source, + }) + +class cmd_sdist(_sdist): + def run(self): + versions = get_versions(verbose=True) + self._versioneer_generated_versions = versions + # unless we update this, the command will keep using the old version + self.distribution.metadata.version = versions["version"] + return _sdist.run(self) + + def make_release_tree(self, base_dir, files): + _sdist.make_release_tree(self, base_dir, files) + # now locate _version.py in the new base_dir directory (remembering + # that it may be a hardlink) and replace it with an updated value + target_versionfile = os.path.join(base_dir, versionfile_source) + print("UPDATING %s" % target_versionfile) + os.unlink(target_versionfile) + with open(target_versionfile, "w") as f: + f.write(SHORT_VERSION_PY % self._versioneer_generated_versions) + +INIT_PY_SNIPPET = """ +from ._version import get_versions +__version__ = get_versions()['version'] +del get_versions +""" + +class cmd_update_files(Command): + description = "install/upgrade Versioneer files: __init__.py SRC/_version.py" + user_options = [] + boolean_options = [] + def initialize_options(self): + pass + def finalize_options(self): + pass + def run(self): + print(" creating %s" % versionfile_source) + with open(versionfile_source, "w") as f: + assert VCS is not None, "please set versioneer.VCS" + LONG = LONG_VERSION_PY[VCS] + f.write(LONG % {"DOLLAR": "$", + "TAG_PREFIX": tag_prefix, + "PARENTDIR_PREFIX": parentdir_prefix, + "VERSIONFILE_SOURCE": versionfile_source, + }) + + ipy = os.path.join(os.path.dirname(versionfile_source), "__init__.py") + if os.path.exists(ipy): + try: + with open(ipy, "r") as f: + old = f.read() + except EnvironmentError: + old = "" + if INIT_PY_SNIPPET not in old: + print(" appending to %s" % ipy) + with open(ipy, "a") as f: + f.write(INIT_PY_SNIPPET) + else: + print(" %s unmodified" % ipy) + else: + print(" %s doesn't exist, ok" % ipy) + ipy = None + + # Make sure both the top-level "versioneer.py" and versionfile_source + # (PKG/_version.py, used by runtime code) are in MANIFEST.in, so + # they'll be copied into source distributions. Pip won't be able to + # install the package without this. + manifest_in = os.path.join(get_root(), "MANIFEST.in") + simple_includes = set() + try: + with open(manifest_in, "r") as f: + for line in f: + if line.startswith("include "): + for include in line.split()[1:]: + simple_includes.add(include) + except EnvironmentError: + pass + # That doesn't cover everything MANIFEST.in can do + # (http://docs.python.org/2/distutils/sourcedist.html#commands), so + # it might give some false negatives. Appending redundant 'include' + # lines is safe, though. + if "versioneer.py" not in simple_includes: + print(" appending 'versioneer.py' to MANIFEST.in") + with open(manifest_in, "a") as f: + f.write("include versioneer.py\n") + else: + print(" 'versioneer.py' already in MANIFEST.in") + if versionfile_source not in simple_includes: + print(" appending versionfile_source ('%s') to MANIFEST.in" % + versionfile_source) + with open(manifest_in, "a") as f: + f.write("include %s\n" % versionfile_source) + else: + print(" versionfile_source already in MANIFEST.in") + + # Make VCS-specific changes. For git, this means creating/changing + # .gitattributes to mark _version.py for export-time keyword + # substitution. + do_vcs_install(manifest_in, versionfile_source, ipy) + +def get_cmdclass(): + cmds = {'version': cmd_version, + 'versioneer': cmd_update_files, + 'build': cmd_build, + 'sdist': cmd_sdist, + } + if 'cx_Freeze' in sys.modules: # cx_freeze enabled? + cmds['build_exe'] = cmd_build_exe + del cmds['build'] + + return cmds -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org