From d155c998cfbe53df2d49445cb59811451f75c8b2 Mon Sep 17 00:00:00 2001 From: Ogaday Date: Wed, 16 Aug 2017 15:06:28 +0100 Subject: [PATCH 1/3] Fix syntax --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fe59b1e..c277451 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,7 @@ install_requires=[ 'boto3', 'requests' - ] + ], long_description=readme, license="MIT" ) From 057ceddac8ce1e2d24b61c062dacbf2d69ea6f7d Mon Sep 17 00:00:00 2001 From: Ogaday Date: Wed, 16 Aug 2017 16:56:04 +0100 Subject: [PATCH 2/3] Single source package --- kbcstorage/__init__.py | 7 ++++++- setup.py | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/kbcstorage/__init__.py b/kbcstorage/__init__.py index b794fd4..2c8c00a 100644 --- a/kbcstorage/__init__.py +++ b/kbcstorage/__init__.py @@ -1 +1,6 @@ -__version__ = '0.1.0' +from pkg_resources import get_distribution, DistributionNotFound +try: + __version__ = get_distribution('kbcstorage').version +except DistributionNotFound: + # package is not installed + pass diff --git a/setup.py b/setup.py index c277451..dfe1084 100644 --- a/setup.py +++ b/setup.py @@ -1,12 +1,12 @@ from setuptools import setup, find_packages -import kbcstorage with open("README.md") as f: readme = f.read() setup( name='kbcstorage', - version=kbcstorage.__version__, + use_scm_version=True, + setup_requires=['setuptools_scm'], url='https://github.com/keboola/sapi-python-client', download_url='https://github.com/keboola/sapi-python-client', packages=find_packages(), From c073bc3290bbe33ede95a23354062b48b68ca23f Mon Sep 17 00:00:00 2001 From: Ogaday Date: Wed, 16 Aug 2017 17:02:40 +0100 Subject: [PATCH 3/3] Make package version string major.minor only --- kbcstorage/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kbcstorage/__init__.py b/kbcstorage/__init__.py index 2c8c00a..cd2e8a3 100644 --- a/kbcstorage/__init__.py +++ b/kbcstorage/__init__.py @@ -1,6 +1,7 @@ from pkg_resources import get_distribution, DistributionNotFound try: - __version__ = get_distribution('kbcstorage').version + release = get_distribution('kbcstorage').version + __version__ = '.'.join(release.split('.')[:2]) except DistributionNotFound: # package is not installed pass