diff --git a/.copier-answers.yml b/.copier-answers.yml index 46840c5..1cdef6e 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,6 +1,6 @@ # WARNING: Do not edit this file manually. # Any changes will be overwritten by Copier. -_commit: v0.4.6 +_commit: v0.4.8 _src_path: gh:easyscience/templates app_docs_url: https://easyscience.github.io/peasy-app app_doi: 10.5281/zenodo.18163581 @@ -13,10 +13,10 @@ lib_package_name: easypeasy lib_python_max: '3.13' lib_python_min: '3.11' lib_repo_name: peasy-lib -project_contact_email: support@easypeasy.org -project_copyright_years: 2021-2026 -project_extended_description: For performing imaginary calculations based on a theoretical - model and refining its parameters against experimental data +project_contact_email: support@easyscience.org +project_copyright_years: 2025-2026 +project_extended_description: A software for performing imaginary calculations based + on a imaginary model and refining its parameters against imaginary data project_homepage_url: https://easyscience.github.io/peasy project_name: EasyPeasy project_repo_name: peasy diff --git a/.github/actions/publish-to-pypi/action.yml b/.github/actions/publish-to-pypi/action.yml deleted file mode 100644 index 719928d..0000000 --- a/.github/actions/publish-to-pypi/action.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: 'Publish to PyPI' -description: 'Publish dist/ to PyPI via Trusted Publishing (OIDC)' -inputs: - packages_dir: - description: 'Directory containing the built packages to upload' - required: false - default: 'dist' - -runs: - using: 'composite' - steps: - - uses: pypa/gh-action-pypi-publish@release/v1 - with: - packages-dir: ${{ inputs.packages_dir }} diff --git a/.github/workflows/pypi-publish.yml b/.github/workflows/pypi-publish.yml index 528c5b6..88834ed 100644 --- a/.github/workflows/pypi-publish.yml +++ b/.github/workflows/pypi-publish.yml @@ -41,4 +41,6 @@ jobs: # Repository name: peasy-lib # Workflow name: pypi-publish.yml - name: Publish to PyPI - uses: ./.github/actions/publish-to-pypi + uses: pypa/gh-action-pypi-publish@release/v1 + with: + packages-dir: 'dist' diff --git a/.github/workflows/release-pr.yml b/.github/workflows/release-pr.yml index b12c477..3192f59 100644 --- a/.github/workflows/release-pr.yml +++ b/.github/workflows/release-pr.yml @@ -6,7 +6,7 @@ # - Adds the label "[bot] pull request" so it is excluded from changelogs. # - The PR body makes clear that this is automation only (no review needed). -name: 'Release PR ( → )' +name: 'Release PR (develop → master)' on: workflow_dispatch: diff --git a/LICENSE b/LICENSE index c4e3e48..a92968f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2021-2026 EasyScience contributors. +Copyright (c) 2025-2026 EasyScience contributors. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/README.md b/README.md index 10dd29c..1d25ba6 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,8 @@

-**EasyPeasy** is a scientific software for performing imaginary -calculations based on a theoretical model and refining its parameters -against experimental data. +**EasyPeasy** is a software for performing imaginary calculations based +on a imaginary model and refining its parameters against imaginary data. diff --git a/docs/docs/index.md b/docs/docs/index.md index 9be05c1..309bae8 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -1,6 +1,6 @@ ![](assets/images/logo_dark.svg#gh-dark-mode-only)![](assets/images/logo_light.svg#gh-light-mode-only) -# Imaginary data analysis library +# Imaginary data analysis Here is a brief overview of the main documentation sections: diff --git a/docs/docs/installation-and-setup/index.md b/docs/docs/installation-and-setup/index.md index 21d17eb..f6885c2 100644 --- a/docs/docs/installation-and-setup/index.md +++ b/docs/docs/installation-and-setup/index.md @@ -11,7 +11,7 @@ To install and set up EasyPeasy, we recommend using [**Pixi**](https://pixi.prefix.dev), a modern package manager for Windows, macOS, and Linux. -!!! note "Main benefits of using Pixi" +??? note "Main benefits of using Pixi" - **Ease of use**: Pixi simplifies the installation process, making it accessible even for users with limited experience in package management. @@ -37,6 +37,26 @@ This section describes the simplest way to set up EasyPeasy using #### Setting up EasyPeasy with Pixi + + +- Choose a project location (local drive recommended). + + ??? warning ":fontawesome-brands-windows: Windows + OneDrive" + + We **do not recommend creating a Pixi project inside OneDrive or other + synced folders**. + + By default, Pixi creates the virtual environment inside the project + directory (in `.pixi/`). On Windows, synced folders such as OneDrive + may cause file‑system issues (e.g., path-length limitations or + restricted link operations), which can lead to unexpected install + errors or environments being recreated. + + Instead, create your project in a **local directory on your drive** + where you have full write permissions. + + + - Initialize a new Pixi project and navigate into it: ```txt pixi init easypeasy diff --git a/docs/docs/introduction/index.md b/docs/docs/introduction/index.md index 88423c1..6a4bb91 100644 --- a/docs/docs/introduction/index.md +++ b/docs/docs/introduction/index.md @@ -6,9 +6,8 @@ icon: material/information-slab-circle ## Description -**EasyPeasy** is a scientific software for performing imaginary -calculations based on a theoretical model and refining its parameters -against experimental data. +**EasyPeasy** is a software for performing imaginary calculations based +on a imaginary model and refining its parameters against imaginary data. **EasyPeasy** is developed both as a Python library and as a cross-platform desktop application. @@ -17,8 +16,10 @@ Here, we focus on the Python library. For the graphical user interface (GUI), please see the corresponding [GUI resources](https://easyscience.github.io/peasy-app). + ## License @@ -62,7 +63,7 @@ on GitHub. ## Get in Touch For general questions or feedback, contact us at -[support@easypeasy.org](mailto:support@easypeasy.org). +[support@easyscience.org](mailto:support@easyscience.org). To report bugs or request features, please use the [GitHub Issue Tracker](https://github.com/easyscience/peasy-lib/issues) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 83cf842..068621a 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -7,7 +7,7 @@ repo_url: https://github.com/easyscience/peasy-lib edit_uri: edit/develop/docs/ # Copyright -copyright: © 2021-2026 EasyPeasy +copyright: © 2025-2026 EasyPeasy # Sets the theme and theme-specific configuration theme: diff --git a/src/easypeasy/__init__.py b/src/easypeasy/__init__.py index e15c5a9..26479d1 100644 --- a/src/easypeasy/__init__.py +++ b/src/easypeasy/__init__.py @@ -1,3 +1,3 @@ -# SPDX-FileCopyrightText: 2021-2026 EasyPeasy contributors +# SPDX-FileCopyrightText: 2025-2026 EasyPeasy contributors # SPDX-License-Identifier: BSD-3-Clause """EasyPeasy library.""" diff --git a/tests/integration/fitting/test_dummy.py b/tests/integration/fitting/test_dummy.py index 203db93..61ba32d 100644 --- a/tests/integration/fitting/test_dummy.py +++ b/tests/integration/fitting/test_dummy.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2026 EasyPeasy contributors +# SPDX-FileCopyrightText: 2025-2026 EasyPeasy contributors # SPDX-License-Identifier: BSD-3-Clause import pytest diff --git a/tests/integration/scipp-analysis/test_dummy.py b/tests/integration/scipp-analysis/test_dummy.py index 203db93..61ba32d 100644 --- a/tests/integration/scipp-analysis/test_dummy.py +++ b/tests/integration/scipp-analysis/test_dummy.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2026 EasyPeasy contributors +# SPDX-FileCopyrightText: 2025-2026 EasyPeasy contributors # SPDX-License-Identifier: BSD-3-Clause import pytest diff --git a/tests/unit/easypeasy/test_dummy.py b/tests/unit/easypeasy/test_dummy.py index 4af53d0..2e02771 100644 --- a/tests/unit/easypeasy/test_dummy.py +++ b/tests/unit/easypeasy/test_dummy.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021-2026 EasyPeasy contributors +# SPDX-FileCopyrightText: 2025-2026 EasyPeasy contributors # SPDX-License-Identifier: BSD-3-Clause diff --git a/tools/update_spdx.py b/tools/update_spdx.py index 6ff8bc6..5e75e70 100644 --- a/tools/update_spdx.py +++ b/tools/update_spdx.py @@ -9,7 +9,7 @@ from pathlib import Path COPYRIGHT_TEXT = ( - '# SPDX-FileCopyrightText: 2021-2026 EasyPeasy contributors ' + '# SPDX-FileCopyrightText: 2025-2026 EasyPeasy contributors ' ) LICENSE_TEXT = '# SPDX-License-Identifier: BSD-3-Clause'