summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2018-05-18 11:43:22 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-06-01 20:18:23 +0000
commit727ecfeadf09edef520513513be78d7d93221a3b (patch)
treef398da53554c688ff539c288c85ac7a4cc66201e
parent2446ebc70fd59fd56758d9e10d0992a64db7a0ed (diff)
downloadpodman-727ecfeadf09edef520513513be78d7d93221a3b.tar.gz
podman-727ecfeadf09edef520513513be78d7d93221a3b.tar.bz2
podman-727ecfeadf09edef520513513be78d7d93221a3b.zip
Use Version from spec file in setup.py
- If envvar PODMAN_VERSION not set use default version of 0.0.0 Signed-off-by: Jhon Honce <jhonce@redhat.com> Closes: #807 Approved by: rhatdan
-rw-r--r--contrib/python/setup.py3
-rw-r--r--contrib/spec/podman.spec.in2
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/python/setup.py b/contrib/python/setup.py
index d1533f968..c9db30199 100644
--- a/contrib/python/setup.py
+++ b/contrib/python/setup.py
@@ -11,9 +11,10 @@ with open(os.path.join(root, 'README.md')) as me:
with open(os.path.join(root, 'requirements.txt')) as r:
requirements = r.read().splitlines()
+
setup(
name='podman',
- version='0.1.0',
+ version=os.environ.get('PODMAN_VERSION', '0.0.0'),
description='A client for communicating with a Podman server',
long_description=readme,
author='Jhon Honce',
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 9a010e5af..542ce1850 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -195,7 +195,6 @@ the Container Pod concept popularized by Kubernetes.
%if %{with varlink}
%package -n python3-%{name}
-Version: 0.1.0
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-setuptools
@@ -382,6 +381,7 @@ popd
ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath}
export BUILDTAGS="selinux seccomp $(hack/btrfs_installed_tag.sh) $(hack/btrfs_tag.sh) $(hack/libdm_tag.sh) containers_image_ostree_stub"
+export PODMAN_VERSION=%{version}
GOPATH=$GOPATH go generate ./cmd/podman/varlink/...
GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name}