Prepare release v1.0.0 (#411)

* setup.py: update requirements * bump version to v.1.0.0 * solvers: remove hard dependency on cvxopt * Update changelog * update copyright notice
JeschkeLab · Dec 19, 2022 · da38704 · da38704
1 parent 9a65fdf
commit da38704
Show file tree

Hide file tree

Showing 22 changed files with 193 additions and 48 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019-2022 Luis Fabregas, Stefan Stoll, Gunnar Jeschke, and other contributors
+Copyright (c) 2019-2023 Luis Fabregas, Stefan Stoll, Gunnar Jeschke, and other contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -58,4 +58,4 @@ Here is the citation in bibtex format:
 
 DeerLab is licensed under the [MIT License](LICENSE).
 
-Copyright © 2019-2022: Luis Fábregas Ibáñez, Stefan Stoll, Gunnar Jeschke, and [other contributors](https://github.com/JeschkeLab/DeerLab/contributors).
+Copyright © 2019-2023: Luis Fábregas Ibáñez, Stefan Stoll, Gunnar Jeschke, and [other contributors](https://github.com/JeschkeLab/DeerLab/contributors).
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v0.15.0-dev
+v1.0.0
diff --git a/deerlab/bg_models.py b/deerlab/bg_models.py
@@ -1,7 +1,7 @@
 # bg_models.py - Background parametric models
 # ---------------------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md). 
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 import math as m

diff --git a/deerlab/bootstrap_analysis.py b/deerlab/bootstrap_analysis.py
@@ -1,7 +1,7 @@
 # bootstrap_analysis.py - Bootstrap analysis for uncertainty estimation
 # --------------------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 import types

diff --git a/deerlab/classes.py b/deerlab/classes.py
@@ -1,5 +1,5 @@
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 from deerlab.utils import Jacobian, nearest_psd

diff --git a/deerlab/correctzerotime.py b/deerlab/correctzerotime.py
@@ -2,7 +2,7 @@
 # correctzerotime.py - Zero-time correction of dipolar signals
 #--------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 import scipy as scp

diff --git a/deerlab/dd_models.py b/deerlab/dd_models.py
@@ -1,7 +1,7 @@
 # dd_models.py - Distance distribtion parametric models
 # ---------------------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md). 
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 
 import inspect

diff --git a/deerlab/dipolarbackground.py b/deerlab/dipolarbackground.py
@@ -1,7 +1,7 @@
 # dipolarbackground.py - Multipathway background generator
 # --------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 import inspect

diff --git a/deerlab/dipolarkernel.py b/deerlab/dipolarkernel.py
@@ -1,7 +1,7 @@
 # dipolarkernel.py - Dipolar kernel operator
 # -----------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 # Numpy + SciPy
 import numpy as np

diff --git a/deerlab/distancerange.py b/deerlab/distancerange.py
@@ -1,7 +1,7 @@
 # distancerange.py - DeerAnalysis distance axis constructor
 # ------------------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md). 
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 import numpy as np
 
 def distancerange(t, nr=None):

diff --git a/deerlab/diststats.py b/deerlab/diststats.py
@@ -1,7 +1,7 @@
 # diststats.py - Distance distribution descriptors
 # -----------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 import warnings

diff --git a/deerlab/fftspec.py b/deerlab/fftspec.py
@@ -2,7 +2,7 @@
 # fftspec.py - Fast-Fourier transform spectrum
 # ---------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md). 
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 from numpy.fft import fft, fftshift, fftfreq

diff --git a/deerlab/model.py b/deerlab/model.py
@@ -1,7 +1,7 @@
 # model.py - DeerLab's modeling interface
 # ---------------------------------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md). 
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 from scipy.sparse import block_diag

diff --git a/deerlab/noiselevel.py b/deerlab/noiselevel.py
@@ -1,7 +1,7 @@
 # noiselevel.py - Noise level estimator
 # -----------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 from numpy import isreal, std, mean, shape, atleast_1d
 from deerlab.utils import movmean, der_snr

diff --git a/deerlab/profile_analysis.py b/deerlab/profile_analysis.py
@@ -1,7 +1,7 @@
 # profile_analysis.py - Likelihood/Objective function
 # --------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 from scipy.stats import chi2 

diff --git a/deerlab/regoperator.py b/deerlab/regoperator.py
@@ -2,7 +2,7 @@
 # regoperator.py - Regularization Operators
 # --------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np
 

diff --git a/deerlab/selregparam.py b/deerlab/selregparam.py
@@ -1,7 +1,7 @@
 # selregparam.py - Regularization parameter selection
 # -----------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 import numpy as np 
 import scipy.optimize as opt

diff --git a/deerlab/solvers.py b/deerlab/solvers.py
@@ -1,11 +1,10 @@
 # solvers.py - Collection of least-squares solvers
 # --------------------------------------------------
 # This file is a part of DeerLab. License is MIT (see LICENSE.md).
-# Copyright(c) 2019-2022: Luis Fabregas, Stefan Stoll and other contributors.
+# Copyright(c) 2019-2023: Luis Fabregas, Stefan Stoll and other contributors.
 
 # External dependencies
 import numpy as np
-import cvxopt as cvx
 import matplotlib.pyplot as plt
 from scipy.optimize import least_squares, lsq_linear
 # DeerLab dependencies
@@ -1172,7 +1171,8 @@ def cvxnnls(AtA, Atb, tol=None, maxiter=None,x0=None):
         Global analysis of complex PELDOR time traces
 
     """
-
+    import cvxopt as cvx
+
     N = np.shape(AtA)[1]
     if tol is None:
         eps = np.finfo(float).eps
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,4 +58,4 @@ Here is the citation in bibtex format:

		DeerLab is licensed under the [MIT License](LICENSE).

		Copyright © 2019-2022: Luis Fábregas Ibáñez, Stefan Stoll, Gunnar Jeschke, and [other contributors](https://github.com/JeschkeLab/DeerLab/contributors).
		Copyright © 2019-2023: Luis Fábregas Ibáñez, Stefan Stoll, Gunnar Jeschke, and [other contributors](https://github.com/JeschkeLab/DeerLab/contributors).