From 0272b45dc0c5e10f71a3b845fbaac3be7fc35212 Mon Sep 17 00:00:00 2001 From: "Adam.Dybbroe" Date: Thu, 16 Jul 2020 09:02:05 +0200 Subject: [PATCH 1/3] Fix unfinished work migrating to use setuptools_scm to make git tag versioning Signed-off-by: Adam.Dybbroe --- .git_archival.txt | 1 + setup.cfg | 5 +++++ setup.py | 12 +++++++----- 3 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 .git_archival.txt diff --git a/.git_archival.txt b/.git_archival.txt new file mode 100644 index 00000000..082d6c25 --- /dev/null +++ b/.git_archival.txt @@ -0,0 +1 @@ +ref-names: $Format:%D$ \ No newline at end of file diff --git a/setup.cfg b/setup.cfg index 4f060e7b..46774cef 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,6 +3,11 @@ setup_requires = setuptools_scm setuptools_scm_git_archive +[bdist_rpm] +provides=pyspectral +requires=satpy pyorbital posttroll trollsift pyyaml dpath<1.5 +release=1 + [bdist_wheel] universal=1 diff --git a/setup.py b/setup.py index d251dcc0..6337529d 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (c) 2013-2019 Pytroll developers +# Copyright (c) 2013-2020 Pytroll developers # Author(s): @@ -23,7 +23,7 @@ """Setup for trollflow2.""" -from setuptools import setup +from setuptools import setup, find_packages import sys try: @@ -56,9 +56,10 @@ "Programming Language :: Python", "Topic :: Scientific/Engineering"], url="https://github.com/pytroll/trollflow2", - packages=['trollflow2', - 'trollflow2.plugins', - ], + packages=find_packages(), + # packages=['trollflow2', + # 'trollflow2.plugins', + # ], scripts=['bin/satpy_launcher.py', ], data_files=[], zip_safe=False, @@ -66,4 +67,5 @@ tests_require=['mock'], python_requires='>=3.4', test_suite='trollflow2.tests.suite', + use_scm_version=True ) From 65cf616f4f21b51e41b2c932e41b7df10d7a2ed1 Mon Sep 17 00:00:00 2001 From: "Adam.Dybbroe" Date: Thu, 16 Jul 2020 09:04:31 +0200 Subject: [PATCH 2/3] Don't provide option to build rpm's Signed-off-by: Adam.Dybbroe --- setup.cfg | 5 ----- 1 file changed, 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 46774cef..4f060e7b 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,11 +3,6 @@ setup_requires = setuptools_scm setuptools_scm_git_archive -[bdist_rpm] -provides=pyspectral -requires=satpy pyorbital posttroll trollsift pyyaml dpath<1.5 -release=1 - [bdist_wheel] universal=1 From 799e286e4fc112d9cb10312beb16ac960ca321d9 Mon Sep 17 00:00:00 2001 From: "Adam.Dybbroe" Date: Thu, 16 Jul 2020 09:21:25 +0200 Subject: [PATCH 3/3] Remove previous used now commented out lines Signed-off-by: Adam.Dybbroe --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 6337529d..5aeb58b2 100644 --- a/setup.py +++ b/setup.py @@ -57,9 +57,6 @@ "Topic :: Scientific/Engineering"], url="https://github.com/pytroll/trollflow2", packages=find_packages(), - # packages=['trollflow2', - # 'trollflow2.plugins', - # ], scripts=['bin/satpy_launcher.py', ], data_files=[], zip_safe=False,