[copr] master: Fixes to allow copr-cli to be installed using setup.py (84d6b40)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 84d6b4018ffad8afaee671a86bf8e5edcf2f94ca Author: Sergio Oliveira <sergio(a)tracy.com.br&gt; Date: Mon Oct 19 17:09:59 2015 -0200 Fixes to allow copr-cli to be installed using setup.py cli/copr_cli/main.py | 3 +-- cli/setup.py | 26 ++++++++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/cli/copr_cli/main.py b/cli/copr_cli/main.py index a881017..a44d3f9 100644 --- a/cli/copr_cli/main.py +++ b/cli/copr_cli/main.py @@ -4,8 +4,7 @@ import os import re import subprocess -__version__ = "0.3.0" -__description__ = "CLI tool to run copr" +__version__ = "1.45.0" import argparse from urlparse import urlparse diff --git a/cli/setup.py b/cli/setup.py index c4b37d1..cc71fd1 100644 --- a/cli/setup.py +++ b/cli/setup.py @@ -1,8 +1,10 @@ #!/usr/bin/python -from setuptools import setup +import codecs +import os +import re -import sys +from setuptools import setup long_description = """Copr is designed to be a lightweight buildsystem that allows contributors to create packages, put them in repositories, and make it easy for users @@ -11,16 +13,28 @@ is used to allow packagers to create third party repositories. This part is a command line interface to use copr.""" -from copr_cli.main import __description__, __version__ - requires = [ 'copr' ] +def read(*parts): + return codecs.open(os.path.join(os.path.dirname(__file__), *parts), + encoding='utf8').read() + + +def find_version(*file_paths): + version_file = read(*file_paths) + version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", + version_file, re.M) + if version_match: + return version_match.group(1) + raise RuntimeError("Unable to find version string.") + + __name__ = 'copr-cli' -__version__ = __version__ -__description__ = __description__ +__version__ = find_version('copr_cli/main.py') +__description__ = "CLI tool to run copr" __author__ = "Pierre-Yves Chibon" __author_email__ = &quot;pingou(a)pingoured.fr&quot; __url__ = "http://fedorahosted.org/copr/"