From 7af7596b70d4559a2143b427c7cda55886700bf8 Mon Sep 17 00:00:00 2001 From: Tom Aldcroft Date: Fri, 20 Jan 2023 18:06:16 -0500 Subject: [PATCH 1/2] De-namespace --- Ska/report_ranges/__init__.py | 2 +- setup.py | 17 +++++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Ska/report_ranges/__init__.py b/Ska/report_ranges/__init__.py index 28cd21e..cb133b6 100644 --- a/Ska/report_ranges/__init__.py +++ b/Ska/report_ranges/__init__.py @@ -2,4 +2,4 @@ from .report_ranges import * # noqa -__version__ = ska_helpers.get_version('Ska.report_ranges') +__version__ = ska_helpers.get_version('ska_report_ranges') diff --git a/setup.py b/setup.py index cca4de5..bfad669 100755 --- a/setup.py +++ b/setup.py @@ -1,11 +1,24 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst from setuptools import setup -setup(name='Ska.report_ranges', + +from ska_helpers.setup_helper import duplicate_package_info + +name = "ska_report_ranges" +namespace = "Ska.report_ranges" + +packages = ["ska_report_ranges"] +package_dir = {name: name} + +duplicate_package_info(packages, name, namespace) +duplicate_package_info(package_dir, name, namespace) + +setup(name=name, author='Jean Connelly', description='Time Range manipulation for report generation', author_email='jconnelly@cfa.harvard.edu', url='http://cxc.harvard.edu/mta/ASPECT/tool_doc/pydocs/Ska.report_ranges.html', use_scm_version=True, zip_safe=False, - packages=['Ska', 'Ska.report_ranges'], + packages=packages, + package_dir=package_dir, ) From 6cfee43da20643a45a2103e84336521e2d19c364 Mon Sep 17 00:00:00 2001 From: Tom Aldcroft Date: Fri, 20 Jan 2023 18:06:47 -0500 Subject: [PATCH 2/2] Move files --- {Ska/report_ranges => ska_report_ranges}/__init__.py | 0 {Ska/report_ranges => ska_report_ranges}/report_ranges.py | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename {Ska/report_ranges => ska_report_ranges}/__init__.py (100%) rename {Ska/report_ranges => ska_report_ranges}/report_ranges.py (100%) diff --git a/Ska/report_ranges/__init__.py b/ska_report_ranges/__init__.py similarity index 100% rename from Ska/report_ranges/__init__.py rename to ska_report_ranges/__init__.py diff --git a/Ska/report_ranges/report_ranges.py b/ska_report_ranges/report_ranges.py similarity index 100% rename from Ska/report_ranges/report_ranges.py rename to ska_report_ranges/report_ranges.py