From 64fdc4f00da1d8ccde719f6e230d69075fb37d98 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Tue, 9 Oct 2018 12:00:05 -0400 Subject: [PATCH] Add missing setup_requires for proper versioning Signed-off-by: Mike Marchetti Change-Id: I19bea140f8f45a112486fed27fef3ee878542a91 --- Dockerfile | 7 +++++-- setup.py | 4 +--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index ef59cb1..f15c511 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,10 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get -y install git make python python3 python3-stdeb \ +RUN apt-get update && apt-get -y install git make python python3 python-pip\ libcurl4-gnutls-dev libgnutls-dev tox python-dev python3-dev \ - debhelper python-setuptools python-all python3-all apt-utils python-magic + debhelper python-setuptools python-all python3-all apt-utils python-magic \ + python3-pip python-pip && \ + DEBIAN_FRONTEND=noninteractive pip3 install -U stdeb setuptools-version-command && \ + DEBIAN_FRONTEND=noninteractive pip2 install -U stdeb diff --git a/setup.py b/setup.py index 62390b6..f116a52 100644 --- a/setup.py +++ b/setup.py @@ -22,7 +22,6 @@ from setuptools import setup here = os.path.abspath(os.path.dirname(__file__)) _name = "osm_common" -# VERSION = "4.0.0rc2" README = open(os.path.join(here, 'README.rst')).read() setup( @@ -30,7 +29,7 @@ setup( name=_name, description='OSM common utilities', long_description=README, - version_command=('git describe --tags --long --dirty', 'pep440-git-full'), + version_command=('git describe --tags --long --dirty --match v*', 'pep440-git-full'), # version=VERSION, # python_requires='>3.5', author='ETSI OSM', @@ -49,6 +48,5 @@ setup( 'pymongo', 'aiokafka', 'PyYAML', - # 'pip', ], ) -- 2.25.1