opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use Version from spec file in setup.py

Browse Source 
- 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
This commit is contained in:
Jhon Honce
2018-05-18 11:43:22 -07:00
committed by Atomic Bot
parent 2446ebc70f
commit 727ecfeadf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/python/setup.py
View File

@ -11,9 +11,10 @@ with open(os.path.join(root, 'README.md')) as me:
with open(os.path.join(root, 'requirements.txt')) as r: with open(os.path.join(root, 'requirements.txt')) as r:
requirements = r.read().splitlines() requirements = r.read().splitlines()
setup( setup(
name='podman', name='podman',
version='0.1.0', version=os.environ.get('PODMAN_VERSION', '0.0.0'),
description='A client for communicating with a Podman server', description='A client for communicating with a Podman server',
long_description=readme, long_description=readme,
author='Jhon Honce', author='Jhon Honce',

2
contrib/spec/podman.spec.in
View File

@ -195,7 +195,6 @@ the Container Pod concept popularized by Kubernetes.
%if %{with varlink} %if %{with varlink}
%package -n python3-%{name} %package -n python3-%{name}
Version: 0.1.0
BuildArch: noarch BuildArch: noarch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-setuptools BuildRequires: python3-setuptools
@ -382,6 +381,7 @@ popd
ln -s vendor src ln -s vendor src
export GOPATH=$(pwd)/_build:$(pwd):$(pwd):%{gopath} 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 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 go generate ./cmd/podman/varlink/...
GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name} GOPATH=$GOPATH BUILDTAGS=$BUILDTAGS %gobuild -o bin/%{name} %{import_path}/cmd/%{name}