From 8f2a5544e5eb8d3d4c1831a194997978646c4700 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Mon, 6 May 2019 18:58:43 +0200 Subject: [PATCH 1/8] Add setup.py to make the pyrakoon installable --- README.MD | 8 +++++ setup.py | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 README.MD create mode 100644 setup.py diff --git a/README.MD b/README.MD new file mode 100644 index 0000000..d4cee81 --- /dev/null +++ b/README.MD @@ -0,0 +1,8 @@ +# Pyrakoon +An alternative Python client for Arakoon + +## Installation +- Download or clone this repository. +- Run `python setup.py install` on the directory where you cloned it. +- Import the client with `from pyrakoon import *` + diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..d8a8365 --- /dev/null +++ b/setup.py @@ -0,0 +1,95 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import io +import os +import re +from setuptools import find_packages, setup + +init_pys = {} + + +def read_init(package): + init_py = init_pys.get(package) + if init_py is not None: + return init_py + path = os.path.join(package, '__init__.py') + print path + with open(os.path.join(package, '__init__.py'), 'r') as init_file: + file_contents = init_file.read() + init_pys[package] = file_contents + return file_contents + + +def get_version(package): + """ + Return package version as listed in `__version__` in `init.py`. + """ + init_py = read_init(package) + # Unable to use __version__ as it is computed. Compute it again + version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", init_py).group(1) + return '.'.join(n.strip() for n in version_numbers.split(',')) + + +def get_author(package): + """ + Return package author as listed in `__author__` in `init.py`. + """ + init_py = read_init(package) + return re.search("__author__ = .*['\"](.*)['\"]", init_py).group(1) + + +def get_license(package): + """ + Return package license as listed in `__license` in `init.py`. + """ + init_py = read_init(package) + return re.search("__license__ = .*['\"](.*)['\"]", init_py).group(1) + + +# Package meta-data. +PACKAGE_NAME = 'pyrakoon' +NAME = 'Pyrakoon' +DESCRIPTION = 'An alternative Python client for Arakoon' +URL = 'https://github.com/openvstorage/pyrakoon' +EMAIL = 'support@openvstorage.com' +AUTHOR = get_author(PACKAGE_NAME) +REQUIRES_PYTHON = '>=2.7.0,<=3.0' +VERSION = get_version(PACKAGE_NAME) +LICENSE = get_license(PACKAGE_NAME) + +# Packages +REQUIRED = [] +EXTRAS = {} + +# Import the README and use it as the long-description. +try: + with io.open('README.MD', encoding='utf-8') as f: + long_description = '\n' + f.read() +except IOError: + long_description = DESCRIPTION + +setup( + name=NAME, + version=VERSION, + description=DESCRIPTION, + long_description=long_description, + long_description_content_type='text/markdown', + author=AUTHOR, + author_email=EMAIL, + python_requires=REQUIRES_PYTHON, + url=URL, + packages=find_packages(exclude=('test', 'demo')), + install_requires=REQUIRED, + extras_require=EXTRAS, + include_package_data=True, + license=LICENSE, + classifiers=[ + # Trove classifiers + # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers + 'License :: OSI Approved :: GNU Lesser General Public License v2 (LGPLv2)', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: Implementation :: CPython', + ], +) From 2312e1a432c5c7ff34a6111404e9b39a4d9071cf Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Tue, 7 May 2019 10:46:43 +0200 Subject: [PATCH 2/8] Add empty requirements.txt --- requirements.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e69de29 From e3579cc37d95b1fe895a233123677c529bcc55dd Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Tue, 7 May 2019 11:38:51 +0200 Subject: [PATCH 3/8] Remove a debug statement --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index d8a8365..0e4627b 100644 --- a/setup.py +++ b/setup.py @@ -13,8 +13,6 @@ def read_init(package): init_py = init_pys.get(package) if init_py is not None: return init_py - path = os.path.join(package, '__init__.py') - print path with open(os.path.join(package, '__init__.py'), 'r') as init_file: file_contents = init_file.read() init_pys[package] = file_contents From e5cbb65ce140e500bc3d0030b9577c621dcbc459 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Tue, 7 May 2019 14:38:43 +0200 Subject: [PATCH 4/8] Split metadata attributes. Adjust setup.py accordingly Introduced a hash file that will be modified upon building --- pyrakoon/__author__.py | 4 ++++ pyrakoon/__hash__.py | 5 +++++ pyrakoon/__init__.py | 8 +++----- pyrakoon/__license__.py | 4 ++++ pyrakoon/__version__.py | 10 ++++++++++ setup.py | 30 ++++++++++++++++++++---------- 6 files changed, 46 insertions(+), 15 deletions(-) create mode 100644 pyrakoon/__author__.py create mode 100644 pyrakoon/__hash__.py create mode 100644 pyrakoon/__license__.py create mode 100644 pyrakoon/__version__.py diff --git a/pyrakoon/__author__.py b/pyrakoon/__author__.py new file mode 100644 index 0000000..cd8a2ec --- /dev/null +++ b/pyrakoon/__author__.py @@ -0,0 +1,4 @@ +# Copyright (C) iNuron - info@openvstorage.com +# This file is part of Open vStorage. For license information, see + +__author__ = u'OpenvStorage' diff --git a/pyrakoon/__hash__.py b/pyrakoon/__hash__.py new file mode 100644 index 0000000..f12a6c9 --- /dev/null +++ b/pyrakoon/__hash__.py @@ -0,0 +1,5 @@ +# Copyright (C) iNuron - info@openvstorage.com +# This file is part of Open vStorage. For license information, see + +# Modified during build step +__hash__ = 'None' diff --git a/pyrakoon/__init__.py b/pyrakoon/__init__.py index 4e302f2..5eb467d 100644 --- a/pyrakoon/__init__.py +++ b/pyrakoon/__init__.py @@ -3,6 +3,9 @@ import logging from .constants.logging import PYRAKOON_LOGGER +from .__version__ import __version__ +from .__author__ import __author__ +from .__license__ import __license__ """ pyrakoon, an Arakoon_ client for Python @@ -10,11 +13,6 @@ .. _Arakoon: http://www.arakoon.org """ -__version_info__ = 0, 0, 1 -__version__ = '.'.join(str(i) for i in __version_info__) -__author__ = u'OpenvStorage' -__license__ = u'LGPL2' - __docformat__ = 'restructuredtext en' # Setup NullHandler diff --git a/pyrakoon/__license__.py b/pyrakoon/__license__.py new file mode 100644 index 0000000..4bb5a22 --- /dev/null +++ b/pyrakoon/__license__.py @@ -0,0 +1,4 @@ +# Copyright (C) iNuron - info@openvstorage.com +# This file is part of Open vStorage. For license information, see + +__license__ = u'LGPL2' diff --git a/pyrakoon/__version__.py b/pyrakoon/__version__.py new file mode 100644 index 0000000..5ed2cec --- /dev/null +++ b/pyrakoon/__version__.py @@ -0,0 +1,10 @@ +# Copyright (C) iNuron - info@openvstorage.com +# This file is part of Open vStorage. For license information, see + +from .__hash__ import __hash__ + +# Used by setup.py to compute the version +__version_info__ = 0, 0, 1 +# Version with the added hash +__version_full__ = __version_info__ + (__hash__,) +__version__ = '.'.join(str(i) for i in __version_full__) diff --git a/setup.py b/setup.py index 0e4627b..ef6266d 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,12 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- +# Copyright (C) iNuron - info@openvstorage.com +# This file is part of Open vStorage. For license information, see import io import os import re +import itertools from setuptools import find_packages, setup init_pys = {} @@ -21,28 +24,35 @@ def read_init(package): def get_version(package): """ - Return package version as listed in `__version__` in `init.py`. + Return package version as listed in `__version__.py` """ - init_py = read_init(package) + with open(os.path.join(package, '__version__.py'), 'r') as version_f: + contents = version_f.read() + with open(os.path.join(package, '__hash__.py'), 'r') as hash_f: + hash_contents = hash_f.read() # Unable to use __version__ as it is computed. Compute it again - version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", init_py).group(1) - return '.'.join(n.strip() for n in version_numbers.split(',')) + version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", contents).group(1) + # Retrieve the hash + hash_content = re.search("__hash__ = .*['\"](.*)['\"]", hash_contents).group(1) + return '.'.join(n.strip() for n in itertools.chain(version_numbers.split(','), [hash_content])) def get_author(package): """ - Return package author as listed in `__author__` in `init.py`. + Return package author as listed in `__author__.py` """ - init_py = read_init(package) - return re.search("__author__ = .*['\"](.*)['\"]", init_py).group(1) + with open(os.path.join(package, '__author__.py'), 'r') as author_f: + contents = author_f.read() + return re.search("__author__ = .*['\"](.*)['\"]", contents).group(1) def get_license(package): """ - Return package license as listed in `__license` in `init.py`. + Return package license as listed in `__license__.py` """ - init_py = read_init(package) - return re.search("__license__ = .*['\"](.*)['\"]", init_py).group(1) + with open(os.path.join(package, '__license__.py'), 'r') as license_f: + contents = license_f.read() + return re.search("__license__ = .*['\"](.*)['\"]", contents).group(1) # Package meta-data. From 2d87381d2520a624f7cab85f05a8328561328c31 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Tue, 7 May 2019 14:53:15 +0200 Subject: [PATCH 5/8] Add version tuple and explain to the decision for 'None' in the hash --- pyrakoon/__hash__.py | 2 +- pyrakoon/__init__.py | 2 +- pyrakoon/__version__.py | 3 ++- setup.py | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyrakoon/__hash__.py b/pyrakoon/__hash__.py index f12a6c9..a34b881 100644 --- a/pyrakoon/__hash__.py +++ b/pyrakoon/__hash__.py @@ -1,5 +1,5 @@ # Copyright (C) iNuron - info@openvstorage.com # This file is part of Open vStorage. For license information, see -# Modified during build step +# Modified during build step. Using 'None' to make it the regex easier __hash__ = 'None' diff --git a/pyrakoon/__init__.py b/pyrakoon/__init__.py index 5eb467d..f7c2bd0 100644 --- a/pyrakoon/__init__.py +++ b/pyrakoon/__init__.py @@ -3,7 +3,7 @@ import logging from .constants.logging import PYRAKOON_LOGGER -from .__version__ import __version__ +from .__version__ import __version__, __version_tuple__ from .__author__ import __author__ from .__license__ import __license__ diff --git a/pyrakoon/__version__.py b/pyrakoon/__version__.py index 5ed2cec..3a7880c 100644 --- a/pyrakoon/__version__.py +++ b/pyrakoon/__version__.py @@ -7,4 +7,5 @@ __version_info__ = 0, 0, 1 # Version with the added hash __version_full__ = __version_info__ + (__hash__,) -__version__ = '.'.join(str(i) for i in __version_full__) +__version_tuple__ = tuple(str(i) for i in __version_full__) +__version__ = '.'.join(__version_tuple__) diff --git a/setup.py b/setup.py index ef6266d..b74134c 100644 --- a/setup.py +++ b/setup.py @@ -32,7 +32,6 @@ def get_version(package): hash_contents = hash_f.read() # Unable to use __version__ as it is computed. Compute it again version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", contents).group(1) - # Retrieve the hash hash_content = re.search("__hash__ = .*['\"](.*)['\"]", hash_contents).group(1) return '.'.join(n.strip() for n in itertools.chain(version_numbers.split(','), [hash_content])) @@ -62,7 +61,7 @@ def get_license(package): URL = 'https://github.com/openvstorage/pyrakoon' EMAIL = 'support@openvstorage.com' AUTHOR = get_author(PACKAGE_NAME) -REQUIRES_PYTHON = '>=2.7.0,<=3.0' +REQUIRES_PYTHON = '>=2.7, <3.0' VERSION = get_version(PACKAGE_NAME) LICENSE = get_license(PACKAGE_NAME) From bbbb67f04398a47ec68920fd0b4b0627f4d883ac Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Fri, 10 May 2019 15:42:52 +0200 Subject: [PATCH 6/8] Set hashes upon the pyrakoon install --- pyrakoon/__hash__.py | 2 +- pyrakoon/__version__.py | 5 ++--- setup.py | 32 +++++++++++++++++++++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/pyrakoon/__hash__.py b/pyrakoon/__hash__.py index a34b881..495af53 100644 --- a/pyrakoon/__hash__.py +++ b/pyrakoon/__hash__.py @@ -1,5 +1,5 @@ # Copyright (C) iNuron - info@openvstorage.com # This file is part of Open vStorage. For license information, see -# Modified during build step. Using 'None' to make it the regex easier +# Modified during build step. Using 'None' to make the regex easier __hash__ = 'None' diff --git a/pyrakoon/__version__.py b/pyrakoon/__version__.py index 3a7880c..a4508d8 100644 --- a/pyrakoon/__version__.py +++ b/pyrakoon/__version__.py @@ -6,6 +6,5 @@ # Used by setup.py to compute the version __version_info__ = 0, 0, 1 # Version with the added hash -__version_full__ = __version_info__ + (__hash__,) -__version_tuple__ = tuple(str(i) for i in __version_full__) -__version__ = '.'.join(__version_tuple__) +__version_tuple__ = __version_info__ + (__hash__,) +__version__ = '.'.join(str(i) for i in __version_tuple__) diff --git a/setup.py b/setup.py index b74134c..ddf73ad 100644 --- a/setup.py +++ b/setup.py @@ -7,9 +7,21 @@ import os import re import itertools +from subprocess import check_output from setuptools import find_packages, setup +from setuptools.command.install import install + + +class PyrakoonInstall(install): + def run(self): + # Setup the hash + set_hash(PACKAGE_NAME) + # Run the setuptools install + install.run(self) + init_pys = {} +hash_regex = "(__hash__ = .*['\"])(.*)(['\"])" def read_init(package): @@ -22,6 +34,21 @@ def read_init(package): return file_contents +def set_hash(package): + try: + commit_hash = check_output(['git', 'rev-parse', 'HEAD']).strip() + print 'Determined the hash to be {}'.format(commit_hash) + hash_file_path = os.path.join(package, '__hash__.py') + with open(hash_file_path, 'r') as hash_f: + contents = hash_f.read() + new_contents = re.sub(hash_regex, '\g<1>{}\g<3>'.format(commit_hash), contents) + with open(hash_file_path, 'w') as hash_f: + hash_f.write(new_contents) + print 'Written out the hash to __hash__.py' + except: + print 'Unable to set the hash' + + def get_version(package): """ Return package version as listed in `__version__.py` @@ -32,7 +59,7 @@ def get_version(package): hash_contents = hash_f.read() # Unable to use __version__ as it is computed. Compute it again version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", contents).group(1) - hash_content = re.search("__hash__ = .*['\"](.*)['\"]", hash_contents).group(1) + hash_content = re.search(hash_regex, hash_contents).group(2) return '.'.join(n.strip() for n in itertools.chain(version_numbers.split(','), [hash_content])) @@ -99,4 +126,7 @@ def get_license(package): 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: Implementation :: CPython', ], + cmdclass={ + 'install': PyrakoonInstall, + }, ) From de51787d947da2f2d5744a548dbca30214f8cef0 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Fri, 24 May 2019 16:23:35 +0200 Subject: [PATCH 7/8] Add framework packaging data for more control Add python setup.py --version support in the setuptools --- packaging/debian/debian/compat | 1 + packaging/debian/debian/control | 13 + packaging/debian/debian/copyright | 429 +++++++++++++++++++++++ packaging/debian/debian/pyrakoon.dirs | 1 + packaging/debian/debian/pyrakoon.install | 1 + packaging/debian/debian/rules | 25 ++ packaging/debian/debian/source/format | 1 + packaging/settings.json | 10 + setup.py | 62 +++- 9 files changed, 525 insertions(+), 18 deletions(-) create mode 100644 packaging/debian/debian/compat create mode 100644 packaging/debian/debian/control create mode 100644 packaging/debian/debian/copyright create mode 100644 packaging/debian/debian/pyrakoon.dirs create mode 100644 packaging/debian/debian/pyrakoon.install create mode 100644 packaging/debian/debian/rules create mode 100644 packaging/debian/debian/source/format create mode 100644 packaging/settings.json diff --git a/packaging/debian/debian/compat b/packaging/debian/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/packaging/debian/debian/compat @@ -0,0 +1 @@ +9 diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control new file mode 100644 index 0000000..b6a012d --- /dev/null +++ b/packaging/debian/debian/control @@ -0,0 +1,13 @@ +Source: openvstorage-health-check +Maintainer: Jonas Libbrecht +Standards-Version: 3.9.4 +Section: python +Priority: optional +Build-Depends: python-all (>= 2.7.2), debhelper (>= 9) + +Package: pyrakoon +Section: python +Architecture: amd64 +Pre-Depends: python (>= 2.7.2), python (<3.0) +Description: An alternative Python client for Arakoon + Socket client to talk to Arakoon clusters diff --git a/packaging/debian/debian/copyright b/packaging/debian/debian/copyright new file mode 100644 index 0000000..01a91b3 --- /dev/null +++ b/packaging/debian/debian/copyright @@ -0,0 +1,429 @@ + +1) The majority of code in the Open vStorage Open Source Edition (OSE) is copyrighted by iNuron. + This code is combined with third-party code that was originally released under licenses that the + Free Software Foundation considers incompatible with the GNU AGPLv3, such as the OpenSSL license, + Berkeley Software Distribution (BSD v4) and the Mozilla Public License (MPL). + (Please see the Open vStorage User Manual for a complete list of third-party code and their licenses.) + As a special exception to the terms and conditions of the AGPL listed below, iNuron gives you explicit + permission to combine its GNU AGPLv3 code contained in Open vStorage OSE with third-party code under + the aforementioned licenses. + You may copy and distribute such a combination provided that you adhere to the terms and conditions of + all of the GNU AGPLv3and the licenses of the third-party code; in particular, you must include the + source code of the entire combination insofar as the GNU AGPLv3 requires distribution of source code. + +2) Whoever creates or distributes a derived work based on Open vStorage OSE is not obligated to grant the + above exceptions for such a version. The GPL allows for releasing a modified version without the above + exception; in addition, iNuron hereby also allows you to release a modified version that carries forward + these exceptions. + +iNuron + +--- + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright © 2007 Free Software Foundation, Inc. + +Preamble +The GNU Affero General Public License is a free, copy left license for software and other kinds of works, specifically +designed to ensure cooperation with the community in the case of network server software. +The licenses for most software and other practical works are designed to take away your freedom to share and change +the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all +versions of a program--to make sure it remains free software for all its users. +When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to +make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you +receive source code or can get it if you want it, that you can change the software or use pieces of it in new free +programs, and that you know you can do these things. +Developers that use our General Public Licenses protect your rights with two steps: +(1) assert copyright on the software, and +(2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. +A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, +if they receive widespread use, become available for other developers to incorporate. Many developers of free software +are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, +this result may fail to come about. The GNU General Public License permits making a modified version and letting the +public access it on a server without ever releasing its source code to the public. +The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code +becomes available to the community. It requires the operator of a network server to provide the source code of the +modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly +accessible server, gives the public access to the source code of the modified version. +An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar +goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the +Affero GPL which permits relicensing under this license. +The precise terms and conditions for copying, distribution and modification follow. + + TERMS AND CONDITIONS + +0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. + "The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". + "Licensees" and "recipients" may be individuals or organizations. + To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, + other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a + work "based on" the earlier work. + A "covered work" means either the unmodified Program or a work based on the Program. + To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily + liable for infringement under applicable copyright law, except executing it on a computer or modifying a private + copy. Propagation includes copying, distribution (with or without modification), making available to the public, + and in some countries other activities as well. + To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere + interaction with a user through a computer network, with no transfer of a copy, is not conveying. + An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and + prominently visible feature that + (1) displays an appropriate copyright notice, and + (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), + that licensees may convey the work under this License, and how to view a copy of this License. + If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets + this criterion. + +1. Source Code. + + The "source code" for a work means the preferred form of the work for making modifications to it. + "Object code" means any non-source form of a work. + A "Standard Interface" means an interface that either is an official standard defined by a recognized standards + body, or, in the case of interfaces specified for a particular programming language, one that is widely used among + developers working in that language. + The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included + in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves + only to enable use of the work with that Major Component, or to implement a Standard Interface for which an + implementation is available to the public in source code form. A "Major Component", in this context, means a major + essential component (kernel, window system, and so on) of the specific operating system (if any) on which the + executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. + The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, + and (for an executable work) run the object code and to modify the work, including scripts to control those + activities. However, it does not include the work's System Libraries, or general-purpose tools or generally + available free programs which are used unmodified in performing those activities but which are not part of the work. + For example, Corresponding Source includes interface definition files associated with source files for the work, + and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed + to require, such as by intimate data communication or control flow between those subprograms and other parts of + the work. + The Corresponding Source need not include anything that users can regenerate automatically from other parts of + the Corresponding Source. + The Corresponding Source for a work in source code form is that same work. + +2. Basic Permissions. + + All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable + provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the + unmodified Program. The output from running a covered work is covered by this License only if the output, given its + content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as + provided by copyright law. + You may make, run and propagate covered works that you do not convey, without conditions so long as your license + otherwise remains in force. You may convey covered works to others for the sole purpose of having them make + modifications exclusively for you, or provide you with facilities for running those works, provided that you comply + with the terms of this License in conveying all material for which you do not control copyright. Those thus making + or running the covered works for you must do so exclusively on your behalf, under your direction and control, on + terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. + Conveying under any other circumstances is permitted solely under the conditions stated below. + Sublicensing is not allowed; section 10 makes it unnecessary. + +3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling + obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting + or restricting circumvention of such measures. + When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the + extent such circumvention is effected by exercising rights under this License with respect to the covered work, and + you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the + work's users, your or third parties' legal rights to forbid circumvention of technological measures. + +4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices + stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep + intact all notices of the absence of any warranty; and give all recipients a copy of this License along with + the Program. + You may charge any price or no price for each copy that you convey, and you may offer support or warranty + protection for a fee. + +5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of + source code under the terms of section 4, provided that you also meet all of these conditions: + * a) The work must carry prominent notices stating that you modified it, and giving a relevant date. + * b) The work must carry prominent notices stating that it is released under this License and any conditions added + under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". + * c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. + This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, + and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any + other way, but it does not invalidate such permission if you have separately received it. + * d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the + Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them + do so. + A compilation of a covered work with other separate and independent works, which are not by their nature extensions + of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a + storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not + used to limit the access or legal rights of the compilation's users beyond what the individual works permit. + Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. + +6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also + convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: + * a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), + accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. + * b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), + accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or + customer support for that product model, to give anyone who possesses the object code either + (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a + durable physical medium customarily used for software interchange, for a price no more than your reasonable cost + of physically performing this conveying of source, or + (2) access to copy the Corresponding Source from a network server at no charge. + * c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding + Source. This alternative is allowed only occasionally and non-commercially, and only if you received the object + code with such an offer, in accord with subsection 6b. + * d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer + equivalent access to the Corresponding Source in the same way through the same place at no further charge. + You need not require recipients to copy the Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or + a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the + object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, + you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. + * e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code + and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. + A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System + Library, need not be included in conveying the object code work. + A "User Product" is either + (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, + or household purposes, or + (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer + product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular + user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the + particular user or of the way in which the particular user actually uses, or expects or is expected to use, the + product. A product is a consumer product regardless of whether the product has substantial commercial, industrial + or non-consumer uses, unless such uses represent the only significant mode of use of the product. + "Installation Information" for a User Product means any methods, procedures, authorization keys, or other + information required to install and execute modified versions of a covered work in that User Product from a + modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning + of the modified object code is in no case prevented or interfered with solely because modification has been made. + If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and + the conveying occurs as part of a transaction in which the right of possession and use of the User Product is + transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), + the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this + requirement does not apply if neither you nor any third party retains the ability to install modified object code + on the User Product (for example, the work has been installed in ROM). + The requirement to provide Installation Information does not include a requirement to continue to provide support + service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User + Product in which it has been modified or installed. Access to a network may be denied when the modification itself + materially and adversely affects the operation of the network or violates the rules and protocols for communication + across the network. + Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a + format that is publicly documented (and with an implementation available to the public in source code form), and + must require no special password or key for unpacking, reading or copying. + +7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more + of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they + were included in this License, to the extent that they are valid under applicable law. If additional permissions + apply only to part of the Program, that part may be used separately under those permissions, but the entire Program + remains governed by this License without regard to the additional permissions. + When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, + or from any part of it. (Additional permissions may be written to require their own removal in certain cases when + you modify the work.) You may place additional permissions on material, added by you to a covered work, for which + you have or can give appropriate copyright permission. + Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized + by the copyright holders of that material) supplement the terms of this License with terms: + * a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or + * b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the + Appropriate Legal Notices displayed by works containing it; or + * c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such + material be marked in reasonable ways as different from the original version; or + * d) Limiting the use for publicity purposes of names of licensors or authors of the material; or + * e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or + * f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or + modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these + contractual assumptions directly impose on those licensors and authors. + All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. + If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License + along with a term that is a further restriction, you may remove that term. If a license document contains a further + restriction but permits relicensing or conveying under this License, you may add to a covered work material governed + by the terms of that license document, provided that the further restriction does not survive such relicensing or + conveying. + If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a + statement of the additional terms that apply to those files, or a notice indicating where to find the applicable + terms. + Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated + as exceptions; the above requirements apply either way. + +8. Termination. + + You may not propagate or modify a covered work except as expressly provided under this License. Any attempt + otherwise to propagate or modify it is void, and will automatically terminate your rights under this License + (including any patent licenses granted under the third paragraph of section 11). + However, if you cease all violation of this License, then your license from a particular copyright holder is + reinstated + (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and + (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 + days after the cessation. + Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies + you of the violation by some reasonable means, this is the first time you have received notice of violation of this + License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of + the notice. + Termination of your rights under this section does not terminate the licenses of parties who have received copies or + rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not + qualify to receive new licenses for the same material under section 10. + +9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation + of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise + does not require acceptance. However, nothing other than this License grants you permission to propagate or modify + any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or + propagating a covered work, you indicate your acceptance of this License to do so. + +10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to + run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by + third parties with this License. + An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of + one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an + entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses + to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to + possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or + can get it with reasonable efforts. + You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. + For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this + License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that + any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion + of it. + +11. Patents. + + A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the + Program is based. The work thus licensed is called the contributor's "contributor version". + A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether + already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, + using, or selling its contributor version, but do not include claims that would be infringed only as a consequence + of further modification of the contributor version. For purposes of this definition, "control" includes the right to + grant patent sublicenses in a manner consistent with the requirements of this License. + Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential + patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its + contributor version. + In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, + not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent + infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to + enforce a patent against the party. + If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not + available for anyone to copy, free of charge and under the terms of this License, through a publicly available + network server or other readily accessible means, then you must either + (1) cause the Corresponding Source to be so available, or + (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or + (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to + downstream recipients. + "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered + work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable + patents in that country that you have reason to believe are valid. + If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring + conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work + authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license + you grant is automatically extended to all recipients of the covered work and works based on it. + A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise + of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this + License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the + business of distributing software, under which you make payment to the third party based on the extent of your + activity of conveying the work, and under which the third party grants, to any of the parties who would receive the + covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed + by you (or copies made from those copies), or (b) primarily for and in connection with specific products or + compilations that contain the covered work, unless you entered into that arrangement, or that patent license was + granted, prior to 28 March 2007. + Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to + infringement that may otherwise be available to you under applicable patent law. + +12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of + this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as + to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a + consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty + for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and + this License would be to refrain entirely from conveying the Program. + +13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the Program, your modified version must + prominently offer all users interacting with it remotely through a computer network (if your version supports such + interaction) an opportunity to receive the Corresponding Source of your version by providing access to the + Corresponding Source from a network server at no charge, through some standard or customary means of facilitating + copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by + version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. + Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a + work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the + resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work + with which it is combined will remain governed by version 3 of the GNU General Public License. + +14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from + time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to + address new problems or concerns. + Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of + the GNU Affero General Public License "or any later version" applies to it, you have the option of following the + terms and conditions either of that numbered version or of any later version published by the Free Software + Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may + choose any version ever published by the Free Software Foundation. + If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can + be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version + for the Program. + Later license versions may give you additional or different permissions. However, no additional obligations are + imposed on any author or copyright holder as a result of your choosing to follow a later version. + +15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN + WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, + EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE + PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + +16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY + WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, + SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT + NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A + FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF + THE POSSIBILITY OF SUCH DAMAGES. + +17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect + according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver + of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a + copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + +How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to + achieve this is to make it free software which everyone can redistribute and change under these terms. + To do so, attach the following notices to the program. It is safest to attach them to the start of each source file t + o most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a + pointer to where the full notice is found. + + Copyright (C) + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + You should have received a copy of the GNU Affero General Public License + along with this program. + If not, see . + Also add information on how to contact you by electronic and paper mail. + If your software can interact with users remotely through a computer network, you should also make sure that it + provides a way for users to get its source. For example, if your program is a web application, its interface could + display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and + different solutions will be better for different programs; see section 13 for the specific requirements. + You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" + for the program, if necessary. + For more information on this, and how to apply and follow the GNU AGPL, see . diff --git a/packaging/debian/debian/pyrakoon.dirs b/packaging/debian/debian/pyrakoon.dirs new file mode 100644 index 0000000..b6ce8f3 --- /dev/null +++ b/packaging/debian/debian/pyrakoon.dirs @@ -0,0 +1 @@ +/usr/lib/python2.7/dist-packages/pyrakoon diff --git a/packaging/debian/debian/pyrakoon.install b/packaging/debian/debian/pyrakoon.install new file mode 100644 index 0000000..b6566d1 --- /dev/null +++ b/packaging/debian/debian/pyrakoon.install @@ -0,0 +1 @@ +pyrakoon/* usr/lib/python2.7/dist-packages/pyrakoon diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules new file mode 100644 index 0000000..1eb5211 --- /dev/null +++ b/packaging/debian/debian/rules @@ -0,0 +1,25 @@ +#!/usr/bin/make -f + +pyrakoon: + dh_testdir + dh_testroot + dh_installdirs -p$@ + dh_installchangelogs -p$@ CHANGELOG.txt + dh_install -p$@ + dh_installman -p$@ + dh_link -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +clean: + if [ -f debian/pyrakoon ]; then rm debian/pyrakoon; fi + +binary: pyrakoon + +.PHONY: clean build diff --git a/packaging/debian/debian/source/format b/packaging/debian/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/packaging/debian/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/packaging/settings.json b/packaging/settings.json new file mode 100644 index 0000000..81fe7ee --- /dev/null +++ b/packaging/settings.json @@ -0,0 +1,10 @@ +{ + "package_name": "pyrakoon", + "product_name": "Pyrakoon", + "tags": ["enterprise"], + "source_contents": "--transform 's,^,{0}-{1}/,' pyrakoon *.txt", + "version": { + "major": 0, + "minor": 1 + } +} diff --git a/setup.py b/setup.py index ddf73ad..616855c 100644 --- a/setup.py +++ b/setup.py @@ -6,12 +6,20 @@ import io import os import re -import itertools from subprocess import check_output from setuptools import find_packages, setup from setuptools.command.install import install +class Container(object): + """ + Houses some variables + """ + def __init__(self): + self.commit_hash = None + self.init_pys = {} + + class PyrakoonInstall(install): def run(self): # Setup the hash @@ -20,33 +28,49 @@ def run(self): install.run(self) -init_pys = {} -hash_regex = "(__hash__ = .*['\"])(.*)(['\"])" +CONTAINER = Container() +HASH_REGEX = "(__hash__ = .*['\"])(.*)(['\"])" def read_init(package): - init_py = init_pys.get(package) + init_py = CONTAINER.init_pys.get(package) if init_py is not None: return init_py with open(os.path.join(package, '__init__.py'), 'r') as init_file: file_contents = init_file.read() - init_pys[package] = file_contents + CONTAINER.init_pys[package] = file_contents return file_contents -def set_hash(package): +def get_hash(package): + """ + Retrieve the hash of the package + """ + _ = package try: - commit_hash = check_output(['git', 'rev-parse', 'HEAD']).strip() - print 'Determined the hash to be {}'.format(commit_hash) - hash_file_path = os.path.join(package, '__hash__.py') - with open(hash_file_path, 'r') as hash_f: - contents = hash_f.read() - new_contents = re.sub(hash_regex, '\g<1>{}\g<3>'.format(commit_hash), contents) - with open(hash_file_path, 'w') as hash_f: - hash_f.write(new_contents) - print 'Written out the hash to __hash__.py' + CONTAINER.commit_hash = check_output(['git', 'rev-parse', 'HEAD']).strip() except: - print 'Unable to set the hash' + CONTAINER.commit_hash = '' + print 'Unable to get the hash' + return CONTAINER.commit_hash + + +def set_hash(package): + """ + Write the hash out the __hash__.py. Done during setup + """ + package_hash = get_hash(package) + if package_hash is not None: + try: + hash_file_path = os.path.join(package, '__hash__.py') + with open(hash_file_path, 'r') as hash_f: + contents = hash_f.read() + new_contents = re.sub(HASH_REGEX, '\g<1>{}\g<3>'.format(package_hash), contents) + with open(hash_file_path, 'w') as hash_f: + hash_f.write(new_contents) + print 'Written out the hash to __hash__.py' + except: + print 'Unable to write the hash' def get_version(package): @@ -59,8 +83,10 @@ def get_version(package): hash_contents = hash_f.read() # Unable to use __version__ as it is computed. Compute it again version_numbers = re.search("__version_info__ = ([0-9]+(?:, ?[0-9]+)*)", contents).group(1) - hash_content = re.search(hash_regex, hash_contents).group(2) - return '.'.join(n.strip() for n in itertools.chain(version_numbers.split(','), [hash_content])) + hash_content = re.search(HASH_REGEX, hash_contents).group(2) + if hash_content == 'None': + hash_content = str(get_hash(package)) + return '{0}+{1}'.format('.'.join(n.strip() for n in version_numbers.split(',')), hash_content) def get_author(package): From 2b2089a95e6a733dafbd716226933051e30b3b66 Mon Sep 17 00:00:00 2001 From: Jeffrey Devloo Date: Mon, 27 May 2019 08:36:28 +0200 Subject: [PATCH 8/8] Bump minor version. Change debian source --- LICENSE => LICENSE.txt | 0 packaging/debian/debian/control | 10 ++++------ packaging/debian/debian/rules | 25 ++----------------------- packaging/settings.json | 2 +- pyrakoon/__version__.py | 2 +- 5 files changed, 8 insertions(+), 31 deletions(-) rename LICENSE => LICENSE.txt (100%) diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control index b6a012d..9a531fc 100644 --- a/packaging/debian/debian/control +++ b/packaging/debian/debian/control @@ -1,13 +1,11 @@ -Source: openvstorage-health-check -Maintainer: Jonas Libbrecht +Source: pyrakoon +Maintainer: OpenvStorage Standards-Version: 3.9.4 Section: python Priority: optional -Build-Depends: python-all (>= 2.7.2), debhelper (>= 9) +Build-Depends: python (>= 2.7.2), debhelper (>= 9) Package: pyrakoon -Section: python Architecture: amd64 -Pre-Depends: python (>= 2.7.2), python (<3.0) +Pre-Depends: python (>= 2.7.2) Description: An alternative Python client for Arakoon - Socket client to talk to Arakoon clusters diff --git a/packaging/debian/debian/rules b/packaging/debian/debian/rules index 1eb5211..2d33f6a 100644 --- a/packaging/debian/debian/rules +++ b/packaging/debian/debian/rules @@ -1,25 +1,4 @@ #!/usr/bin/make -f -pyrakoon: - dh_testdir - dh_testroot - dh_installdirs -p$@ - dh_installchangelogs -p$@ CHANGELOG.txt - dh_install -p$@ - dh_installman -p$@ - dh_link -p$@ - dh_strip -p$@ - dh_compress -p$@ - dh_fixperms -p$@ - dh_installdeb -p$@ - dh_shlibdeps -p$@ - dh_gencontrol -p$@ - dh_md5sums -p$@ - dh_builddeb -p$@ - -clean: - if [ -f debian/pyrakoon ]; then rm debian/pyrakoon; fi - -binary: pyrakoon - -.PHONY: clean build +%: + dh $@ diff --git a/packaging/settings.json b/packaging/settings.json index 81fe7ee..2ba6d90 100644 --- a/packaging/settings.json +++ b/packaging/settings.json @@ -2,7 +2,7 @@ "package_name": "pyrakoon", "product_name": "Pyrakoon", "tags": ["enterprise"], - "source_contents": "--transform 's,^,{0}-{1}/,' pyrakoon *.txt", + "source_contents": "--transform 's,^,{0}-{1}/,' pyrakoon CHANGELOG.txt LICENSE.txt", "version": { "major": 0, "minor": 1 diff --git a/pyrakoon/__version__.py b/pyrakoon/__version__.py index a4508d8..fa56f8a 100644 --- a/pyrakoon/__version__.py +++ b/pyrakoon/__version__.py @@ -4,7 +4,7 @@ from .__hash__ import __hash__ # Used by setup.py to compute the version -__version_info__ = 0, 0, 1 +__version_info__ = 0, 1, 0 # Version with the added hash __version_tuple__ = __version_info__ + (__hash__,) __version__ = '.'.join(str(i) for i in __version_tuple__)