From fd50facd3e681aafa9887e2e055741a2b84a5289 Mon Sep 17 00:00:00 2001 From: Kelle Cruz Date: Wed, 13 Nov 2024 09:05:52 +0100 Subject: [PATCH 1/3] remove versioning code --- sedkit/__init__.py | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/sedkit/__init__.py b/sedkit/__init__.py index 5ebaceef..9a1cc2f9 100644 --- a/sedkit/__init__.py +++ b/sedkit/__init__.py @@ -4,28 +4,8 @@ # !python3 """ Initialize modules - -Author: Joe Filippazzo, jfilippazzo@stsci.edu """ -import re - -from .catalog import Catalog -from .sed import SED, VegaSED -from .spectrum import Spectrum, FileSpectrum, Vega, Blackbody -from .modelgrid import ModelGrid, BTSettl, SpexPrismLibrary - -__version_commit__ = '' -_regex_git_hash = re.compile(r'.*\+g(\w+)') - -__version__ = '1.2.5' - -# from pkg_resources import get_distribution, DistributionNotFound -# try: -# __version__ = get_distribution(__name__).version -# except DistributionNotFound: -# __version__ = 'dev' - -if '+' in __version__: - commit = _regex_git_hash.match(__version__).groups() - if commit: - __version_commit__ = commit[0] +from catalog import Catalog +from sed import SED, VegaSED +from spectrum import Spectrum, FileSpectrum, Vega, Blackbody +from modelgrid import ModelGrid, BTSettl, SpexPrismLibrary From 156fed152d28ce0ffce89a536fbb23ca11d6fe04 Mon Sep 17 00:00:00 2001 From: Kelle Cruz Date: Wed, 13 Nov 2024 09:14:17 +0100 Subject: [PATCH 2/3] Update __init__.py --- sedkit/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sedkit/__init__.py b/sedkit/__init__.py index 9a1cc2f9..f41ce7d4 100644 --- a/sedkit/__init__.py +++ b/sedkit/__init__.py @@ -5,7 +5,7 @@ """ Initialize modules """ -from catalog import Catalog -from sed import SED, VegaSED -from spectrum import Spectrum, FileSpectrum, Vega, Blackbody -from modelgrid import ModelGrid, BTSettl, SpexPrismLibrary +from sedkit.catalog import Catalog +from sedkit.sed import SED, VegaSED +from sedkit.spectrum import Spectrum, FileSpectrum, Vega, Blackbody +from sedkit.modelgrid import ModelGrid, BTSettl, SpexPrismLibrary From 3168e836596fb04569eefe95a48f61167d0f9d24 Mon Sep 17 00:00:00 2001 From: Kelle Cruz Date: Wed, 13 Nov 2024 14:23:36 +0000 Subject: [PATCH 3/3] add setuptools_scm table --- pyproject.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 5b131ec1..20d61799 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -38,6 +38,8 @@ dependencies = [ dynamic = ["version"] readme = "README.md" +[tool.setuptools_scm] + [project.optional-dependencies] test = [ "pytest",