From 3524c2e358642a7915f0856c47ceff740ea0b349 Mon Sep 17 00:00:00 2001 From: Nicola Omodei Date: Fri, 2 Feb 2024 16:50:43 -0800 Subject: [PATCH 1/4] fixed doc 2 --- .readthedocs.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.readthedocs.yml b/.readthedocs.yml index f297773f..7ca8b7a3 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -1,12 +1,16 @@ version: 2 +build: + os: ubuntu-22.04 + tools: + python: "3.9" + python: - version: 3.7 - install: - - requirements: docs/requirements.txt - - method: pip - path: . - extra_requirements: + install: + - requirements: docs/requirements.txt + - method: pip + path: . + extra_requirements: - docs From d5c5416d90255132c3deb77fbe58a5a278c3fc09 Mon Sep 17 00:00:00 2001 From: ndilalla Date: Fri, 17 May 2024 13:57:25 -0700 Subject: [PATCH 2/4] Adding limit to matplotlib. --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e375bf1a..bb8a6de3 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -34,7 +34,7 @@ jobs: python -m pip install --upgrade pip wheel - python -m pip install numpy numba tempita jupytext jupyterthemes jupyter_latex_envs papermill matplotlib astropy pandas tables healpy + python -m pip install numpy numba tempita jupytext jupyterthemes jupyter_latex_envs papermill "matplotlib<3.9" astropy pandas tables healpy python -m pip install ebltable black cython pkgconfig h5py From 2d7f3e50f8ec72a6a225c29f88b5ea699d1fc6c2 Mon Sep 17 00:00:00 2001 From: Israel Martinez Date: Thu, 6 Jun 2024 13:39:50 -0400 Subject: [PATCH 3/4] Update configparser SafeConfigParser and readfp, new in python 3.12 --- versioneer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/versioneer.py b/versioneer.py index 2fc1a076..be0dc74f 100644 --- a/versioneer.py +++ b/versioneer.py @@ -341,9 +341,9 @@ def get_config_from_root(root): # configparser.NoOptionError (if it lacks "VCS="). See the docstring at # the top of versioneer.py for instructions on writing your setup.cfg . setup_cfg = os.path.join(root, "setup.cfg") - parser = configparser.SafeConfigParser() + parser = configparser.ConfigParser() with open(setup_cfg, "r") as f: - parser.readfp(f) + parser.read_file(f) VCS = parser.get("versioneer", "VCS") # mandatory def get(parser, name): From 45ca06f33580b83ef74a246438d249e7d44c8a07 Mon Sep 17 00:00:00 2001 From: AlexKurek Date: Wed, 17 Jul 2024 18:42:23 +0200 Subject: [PATCH 4/4] Remove unused modules --- astromodels/core/model.py | 4 +--- astromodels/core/model_parser.py | 2 +- astromodels/core/node_type.py | 1 - astromodels/core/parameter.py | 2 +- astromodels/core/property.py | 2 +- astromodels/core/tree.py | 4 +--- astromodels/core/units.py | 1 - astromodels/functions/dark_matter/dm_models.py | 1 - astromodels/functions/functions_1D/absorption.py | 2 +- astromodels/functions/functions_1D/blackbody.py | 3 --- astromodels/functions/functions_1D/functions.py | 1 - astromodels/functions/functions_1D/polynomials.py | 4 ---- astromodels/functions/functions_1D/powerlaws.py | 8 +------- astromodels/functions/numba_functions.py | 1 - astromodels/functions/template_model.py | 3 +-- astromodels/sources/point_source.py | 2 +- astromodels/sources/source.py | 2 +- astromodels/tests/test_polarization.py | 6 +----- astromodels/tests/test_template_model.py | 1 - astromodels/tests/test_tree.py | 1 - astromodels/utils/configuration.py | 3 +-- astromodels/utils/io.py | 4 ---- astromodels/utils/logging.py | 2 -- 23 files changed, 12 insertions(+), 48 deletions(-) diff --git a/astromodels/core/model.py b/astromodels/core/model.py index 486f57de..05974530 100644 --- a/astromodels/core/model.py +++ b/astromodels/core/model.py @@ -6,12 +6,10 @@ import os import warnings from dataclasses import dataclass -from typing import Any, Dict, Iterable, List, Optional, Tuple, Union +from typing import Dict, Iterable, List, Tuple, Union import numpy as np import pandas as pd -import scipy.integrate -from astromodels.core.memoization import use_astromodels_memoization from astromodels.core.my_yaml import my_yaml from astromodels.core.parameter import IndependentVariable, Parameter from astromodels.core.property import FunctionProperty diff --git a/astromodels/core/model_parser.py b/astromodels/core/model_parser.py index e52e96e6..cdab2fef 100644 --- a/astromodels/core/model_parser.py +++ b/astromodels/core/model_parser.py @@ -4,7 +4,7 @@ import re import warnings -from typing import Any, Dict, List, Optional, Union +from typing import Dict, List from astromodels.core import ( model, diff --git a/astromodels/core/node_type.py b/astromodels/core/node_type.py index 1f9096cb..ffe11cd5 100644 --- a/astromodels/core/node_type.py +++ b/astromodels/core/node_type.py @@ -1,5 +1,4 @@ import collections -import itertools from dataclasses import dataclass, field from typing import Dict, List, Optional, Tuple, Type, Any from rich.tree import Tree diff --git a/astromodels/core/parameter.py b/astromodels/core/parameter.py index c61d555e..709951d7 100644 --- a/astromodels/core/parameter.py +++ b/astromodels/core/parameter.py @@ -6,7 +6,7 @@ import contextlib import copy import warnings -from typing import Any, Dict, List, Optional, Tuple +from typing import Any, Dict, Optional, Tuple import astropy.units as u import numpy as np diff --git a/astromodels/core/property.py b/astromodels/core/property.py index 7a7ccd14..e6a235d2 100644 --- a/astromodels/core/property.py +++ b/astromodels/core/property.py @@ -1,6 +1,6 @@ import collections import copy -from typing import Any, Dict, List, Optional, Tuple, Union +from typing import Any, Dict, List, Optional from astromodels.utils.logging import setup_logger diff --git a/astromodels/core/tree.py b/astromodels/core/tree.py index 62118704..485d4d4a 100644 --- a/astromodels/core/tree.py +++ b/astromodels/core/tree.py @@ -1,7 +1,5 @@ import collections -import os -import uuid -from typing import Any, Dict, List, Optional, Union +from typing import Any, Dict from future import standard_library diff --git a/astromodels/core/units.py b/astromodels/core/units.py index 25f719ed..b10065cb 100644 --- a/astromodels/core/units.py +++ b/astromodels/core/units.py @@ -6,7 +6,6 @@ import astropy.units as u -from astromodels.core.tree import Node from astromodels.utils.pretty_list import dict_to_list # This module keeps the configuration of the units used in astromodels diff --git a/astromodels/functions/dark_matter/dm_models.py b/astromodels/functions/dark_matter/dm_models.py index 2f36c098..97c4a942 100644 --- a/astromodels/functions/dark_matter/dm_models.py +++ b/astromodels/functions/dark_matter/dm_models.py @@ -2,7 +2,6 @@ import astropy.units as astropy_units import numpy as np -import six from scipy.interpolate import RegularGridInterpolator from astromodels.functions.function import Function1D, FunctionMeta diff --git a/astromodels/functions/functions_1D/absorption.py b/astromodels/functions/functions_1D/absorption.py index 1afaa80d..eb3dd289 100644 --- a/astromodels/functions/functions_1D/absorption.py +++ b/astromodels/functions/functions_1D/absorption.py @@ -1,7 +1,7 @@ import math from dataclasses import dataclass from pathlib import Path -from typing import Any, Dict, List, Optional +from typing import List import astropy.units as astropy_units import numba as nb diff --git a/astromodels/functions/functions_1D/blackbody.py b/astromodels/functions/functions_1D/blackbody.py index 1a517d33..60648910 100644 --- a/astromodels/functions/functions_1D/blackbody.py +++ b/astromodels/functions/functions_1D/blackbody.py @@ -1,15 +1,12 @@ from __future__ import division import astropy.units as astropy_units -import numpy as np from past.utils import old_div import astromodels.functions.numba_functions as nb_func -from astromodels.core.units import get_units from astromodels.functions.function import ( Function1D, FunctionMeta, - ModelAssertionViolation, ) diff --git a/astromodels/functions/functions_1D/functions.py b/astromodels/functions/functions_1D/functions.py index 644083a7..fe277982 100644 --- a/astromodels/functions/functions_1D/functions.py +++ b/astromodels/functions/functions_1D/functions.py @@ -4,7 +4,6 @@ import numpy as np from past.utils import old_div -import astromodels.functions.numba_functions as nb_func from astromodels.core.units import get_units from astromodels.functions.function import Function1D, FunctionMeta from astromodels.utils.configuration import astromodels_config diff --git a/astromodels/functions/functions_1D/polynomials.py b/astromodels/functions/functions_1D/polynomials.py index 1b114278..58d4efdb 100644 --- a/astromodels/functions/functions_1D/polynomials.py +++ b/astromodels/functions/functions_1D/polynomials.py @@ -1,13 +1,9 @@ -import astropy.units as astropy_units import numpy as np -from past.utils import old_div -import astromodels.functions.numba_functions as nb_func from astromodels.core.units import get_units from astromodels.functions.function import ( Function1D, FunctionMeta, - ModelAssertionViolation, ) diff --git a/astromodels/functions/functions_1D/powerlaws.py b/astromodels/functions/functions_1D/powerlaws.py index 4a123228..6092f541 100644 --- a/astromodels/functions/functions_1D/powerlaws.py +++ b/astromodels/functions/functions_1D/powerlaws.py @@ -1,15 +1,9 @@ -import math -import warnings -from typing import Iterable - import astropy.units as astropy_units import numpy as np -import six from past.utils import old_div -from scipy.special import erfcinv, gamma, gammaincc +from scipy.special import gamma, gammaincc import astromodels.functions.numba_functions as nb_func -from astromodels.core.units import get_units from astromodels.functions.function import ( Function1D, FunctionMeta, diff --git a/astromodels/functions/numba_functions.py b/astromodels/functions/numba_functions.py index 71933f4e..bf481165 100644 --- a/astromodels/functions/numba_functions.py +++ b/astromodels/functions/numba_functions.py @@ -1,4 +1,3 @@ -import ctypes import math import numba as nb diff --git a/astromodels/functions/template_model.py b/astromodels/functions/template_model.py index 5861da0f..677cc9da 100644 --- a/astromodels/functions/template_model.py +++ b/astromodels/functions/template_model.py @@ -5,7 +5,7 @@ import warnings from dataclasses import dataclass from pathlib import Path -from typing import Any, Dict, List, Optional, Union +from typing import Dict, List, Optional, Union import astropy.io.fits as fits import astropy.units as u @@ -15,7 +15,6 @@ from interpolation import interp from interpolation.splines import eval_linear -from joblib import Parallel, delayed from astromodels.core.parameter import Parameter from astromodels.functions.function import Function1D, FunctionMeta diff --git a/astromodels/sources/point_source.py b/astromodels/sources/point_source.py index 57de50d5..c21113ef 100644 --- a/astromodels/sources/point_source.py +++ b/astromodels/sources/point_source.py @@ -1,7 +1,7 @@ from __future__ import division import collections -from typing import Any, Dict, List, Optional, Union +from typing import Dict, Optional import astropy.units as u import numba as nb diff --git a/astromodels/sources/source.py b/astromodels/sources/source.py index 36fe0b07..79543b1b 100644 --- a/astromodels/sources/source.py +++ b/astromodels/sources/source.py @@ -2,7 +2,7 @@ from enum import Enum, unique from astromodels.utils.logging import setup_logger -from typing import Dict, Optional, List, Any +from typing import Dict, List, Any from astromodels.core.parameter import Parameter diff --git a/astromodels/tests/test_polarization.py b/astromodels/tests/test_polarization.py index d3ddd577..0530ef89 100644 --- a/astromodels/tests/test_polarization.py +++ b/astromodels/tests/test_polarization.py @@ -1,13 +1,9 @@ from __future__ import division import os - -import copy - -import numpy as np import math -from astromodels import u, update_logging_level +from astromodels import update_logging_level from astromodels.core.polarization import * from astromodels.core.model import Model from astromodels.core.model_parser import * diff --git a/astromodels/tests/test_template_model.py b/astromodels/tests/test_template_model.py index 9f5e3139..34b9e4be 100644 --- a/astromodels/tests/test_template_model.py +++ b/astromodels/tests/test_template_model.py @@ -12,7 +12,6 @@ from astromodels import Model, PointSource, clone_model, load_model from astromodels.functions import ( Band, - MissingDataFile, Powerlaw, TemplateModel, TemplateModelFactory, diff --git a/astromodels/tests/test_tree.py b/astromodels/tests/test_tree.py index 61f773c2..7865a9a9 100644 --- a/astromodels/tests/test_tree.py +++ b/astromodels/tests/test_tree.py @@ -1,7 +1,6 @@ from __future__ import print_function import gc -import os from builtins import range import astropy.units as u diff --git a/astromodels/utils/configuration.py b/astromodels/utils/configuration.py index f5402ef1..318a41ff 100644 --- a/astromodels/utils/configuration.py +++ b/astromodels/utils/configuration.py @@ -1,5 +1,4 @@ -from pathlib import Path -from typing import Any, Dict, Optional +from typing import Optional from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig diff --git a/astromodels/utils/io.py b/astromodels/utils/io.py index bc3df986..4882fb0a 100644 --- a/astromodels/utils/io.py +++ b/astromodels/utils/io.py @@ -6,11 +6,9 @@ # create a wrapper which just uses print try: - from IPython.display import display except ImportError: - def display(*args): """ Mock version of display, used if there is no ipython installed @@ -19,11 +17,9 @@ def display(*args): try: - from IPython.display import Latex except ImportError: - class Latex(object): """ Mock version of the IPython Latex object, used if there is no ipython installed diff --git a/astromodels/utils/logging.py b/astromodels/utils/logging.py index adbe9801..bd968457 100644 --- a/astromodels/utils/logging.py +++ b/astromodels/utils/logging.py @@ -12,8 +12,6 @@ from astromodels.utils.configuration import astromodels_config -from .file_utils import _get_data_file_path - try: from threeML.config.config import threeML_config