diff --git a/.github/workflows/ci_PR.yml b/.github/workflows/ci_PR.yml index 88374ad6..e220f780 100644 --- a/.github/workflows/ci_PR.yml +++ b/.github/workflows/ci_PR.yml @@ -12,13 +12,13 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: ['3.11','3.12'] + python-version: ['3.12','3.13'] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' diff --git a/.github/workflows/ci_scheduled.yml b/.github/workflows/ci_scheduled.yml index 65542133..c39e6034 100644 --- a/.github/workflows/ci_scheduled.yml +++ b/.github/workflows/ci_scheduled.yml @@ -12,12 +12,12 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest, macos-latest, windows-latest] - python-version: [3.9, "3.10", "3.11", "3.12"] + python-version: ["3.10", "3.11", "3.12","3.13"] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} cache: 'pip' diff --git a/.github/workflows/deploy_ghpages.yml b/.github/workflows/deploy_ghpages.yml index 195370c9..7c0b068d 100644 --- a/.github/workflows/deploy_ghpages.yml +++ b/.github/workflows/deploy_ghpages.yml @@ -10,12 +10,12 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' cache-dependency-path: setup.py - name: Install dependencies diff --git a/.github/workflows/docs_PR.yml b/.github/workflows/docs_PR.yml index cd4f9f67..7469c572 100644 --- a/.github/workflows/docs_PR.yml +++ b/.github/workflows/docs_PR.yml @@ -14,12 +14,12 @@ jobs: docsbuild: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' cache-dependency-path: setup.py - name: Install dependencies diff --git a/.github/workflows/examples_PR.yml b/.github/workflows/examples_PR.yml index 94a5ddfc..8f5ee280 100644 --- a/.github/workflows/examples_PR.yml +++ b/.github/workflows/examples_PR.yml @@ -14,12 +14,12 @@ jobs: deploy: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up Python 3.10 - uses: actions/setup-python@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: '3.10' + python-version: '3.12' cache: 'pip' cache-dependency-path: setup.py diff --git a/.github/workflows/package_upload.yml b/.github/workflows/package_upload.yml index 4a3b9977..a6114eb4 100644 --- a/.github/workflows/package_upload.yml +++ b/.github/workflows/package_upload.yml @@ -10,11 +10,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v1 - - name: Set up Python 3.11 - uses: actions/setup-python@v1 + uses: actions/checkout@v4 + - name: Set up Python 3.12 + uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.12" - name: Install pypa/build run: >- python -m pip install build --user diff --git a/VERSION b/VERSION index 3e0c29c6..79127d85 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v1.1.5 +v1.2.0 diff --git a/deerlab/dd_models.py b/deerlab/dd_models.py index cab6ee24..68707da9 100644 --- a/deerlab/dd_models.py +++ b/deerlab/dd_models.py @@ -50,16 +50,17 @@ def _dd_docstring(model,notes): string += '\n' string += '\n' table = [] - table.append(['Name','Lower','Upper','Type','Frozen','Unit','Description']) + table.append(['Name','Lower','Upper','par0','Type','Frozen','Unit','Description']) for n,paramname in enumerate(model._parameter_list(order='vector')): param_str = f'``{paramname}``' lb_str = f'{np.atleast_1d(getattr(model,paramname).lb)[0]:5.3g}' ub_str = f'{np.atleast_1d(getattr(model,paramname).ub)[0]:5.3g}' + par0_str = f'{np.atleast_1d(getattr(model,paramname).par0)[0]:5.3g}' linear_str = "linear" if np.all(getattr(model,paramname).linear) else "nonlin" frozen_str = "Yes" if np.all(getattr(model,paramname).frozen) else "No" unit_str = str(getattr(model,paramname).unit) desc_str = str(getattr(model,paramname).description) - table.append([param_str,lb_str,ub_str,linear_str,frozen_str,unit_str,desc_str]) + table.append([param_str,lb_str,ub_str,par0_str,linear_str,frozen_str,unit_str,desc_str]) string += formatted_table(table) string += f'\n{notes}' @@ -197,7 +198,7 @@ def _gauss2(r,mean1,std1,mean2,std2): #======================================================================================= # dd_gauss3 #======================================================================================= -ntoes = r""" +notes = r""" **Model** :math:`P(r) = a_1\frac{1}{\sigma_1\sqrt{2\pi}}\exp\left(-\frac{(r-\left)^2}{2\sigma_1^2}\right) + a_2\frac{1}{\sigma_2\sqrt{2\pi}}\exp\left(-\frac{(r-\left)^2}{2\sigma_2^2}\right) + a_3\frac{1}{\sigma_3\sqrt{2\pi}}\exp\left(-\frac{(r-\left)^2}{2\sigma_3^2}\right)` diff --git a/docsrc/source/changelog.rst b/docsrc/source/changelog.rst index 0655c6ea..3f38ef7c 100644 --- a/docsrc/source/changelog.rst +++ b/docsrc/source/changelog.rst @@ -25,7 +25,16 @@ Release Notes - |api| : This will require changes in your scripts or code. +Release ``v1.2`` - December 2024 +------------------------------------------ +- |feature| : `modelUncert` is now returned in the `FitResult` object +- |fix| : Fixes issues with bootrstrap uncertainties +- |api| : N bootstrap samples no longer produces N+1 samples +- |enhancement| : Support Python 3.13 +- |fix| : All gaussian models now normalise to 1 + Release ``v1.1.5`` - January 2025 +------------------------------------------ - |fix|: Moves to numpy 2.0 as a mimum requirement, and removes all `np.trapz` calls to `np.trapezoid`. Release ``v1.1.4`` - September 2024