Skip to content

Commit

Permalink
Update version extraction from metadata
Browse files Browse the repository at this point in the history
  • Loading branch information
simontorres committed Jul 22, 2024
1 parent f625c1c commit bc3ab81
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 21 deletions.
3 changes: 2 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
# import os
# import sys
# sys.path.insert(0, os.path.abspath('.'))
from importlib.metadata import version


# -- General configuration ------------------------------------------------
Expand All @@ -31,7 +32,7 @@
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.

__version__ = __import__('goodman_pipeline').__version__
__version__ = version('goodman_pipeline')

extensions = ['sphinx.ext.todo',
'sphinx.ext.coverage',
Expand Down
6 changes: 4 additions & 2 deletions goodman_pipeline/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
from __future__ import absolute_import

from .version import __version__
from importlib.metadata import version

from . import spectroscopy
from . import images
from . import core

from .core import setup_logging
from .core import setup_logging

__version__ = version('goodman_pipeline')
3 changes: 2 additions & 1 deletion goodman_pipeline/core/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,14 @@
from astropy.stats import sigma_clip
from astropy.time import Time
from astroscrappy import detect_cosmics
from importlib.metadata import version
from matplotlib import pyplot as plt
from scipy import signal, interpolate
from threading import Timer

from . import check_version

__version__ = __import__('goodman_pipeline').__version__
__version__ = version('goodman_pipeline')

log = logging.getLogger(__name__)

Expand Down
5 changes: 3 additions & 2 deletions goodman_pipeline/core/tests/test_check_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@

import os
import unittest

import requests

from importlib.metadata import version

from goodman_pipeline.core import check_version

__version__ = __import__('goodman_pipeline').__version__
__version__ = version('goodman_pipeline')


class TestVersionChecker(unittest.TestCase):
Expand Down
11 changes: 7 additions & 4 deletions goodman_pipeline/images/goodman_ccd.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

from .data_classifier import DataClassifier
from .night_organizer import NightOrganizer
from .image_processor import ImageProcessor

import os
import sys
Expand All @@ -13,14 +10,20 @@
import logging
import matplotlib

from importlib.metadata import version

from .data_classifier import DataClassifier
from .night_organizer import NightOrganizer
from .image_processor import ImageProcessor

log = logging.getLogger(__name__)

try:
matplotlib.use('Qt5Agg')
except ImportError as error:
log.warning(error)

__version__ = __import__('goodman_pipeline').__version__
__version__ = version('goodman_pipeline')


def get_args(arguments=None):
Expand Down
23 changes: 12 additions & 11 deletions goodman_pipeline/spectroscopy/redspec.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,17 @@
from __future__ import (absolute_import, division, print_function,
unicode_literals)

import sys
import os
import argparse
import astropy.units as u
import logging
from ccdproc import CCDData

import matplotlib.pyplot as plt
import warnings
from importlib.metadata import version

from .wavelength import WavelengthCalibration
from ..core import (classify_spectroscopic_data,
search_comp_group,
Expand All @@ -28,21 +39,11 @@
NoTargetException,
ReferenceData)

import sys
import os
import argparse
import astropy.units as u
import logging
from ccdproc import CCDData

import matplotlib.pyplot as plt
import warnings

SHOW_PLOTS = True

warnings.filterwarnings('ignore')

__version__ = __import__('goodman_pipeline').__version__
__version__ = version('goodman_pipeline')


def get_args(arguments=None):
Expand Down

0 comments on commit bc3ab81

Please sign in to comment.