Repository navigation
chore: add Python 3.14 support #31
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d63d6bc
bump python version to 3.14
SYMSCAE f9fad4f
Merge branch 'main' into py314
SYMSCAE 1dc3297
remove python 3.11 support
SYMSCAE 7e18d23
changed news item category
SYMSCAE c12b154
Merge branch 'main' into py314
SYMSCAE df0d48a
run package update
SYMSCAE 4c5f6be
fix dependencies
SYMSCAE 487bed6
correct repo info and revert readme
SYMSCAE 71b558f
fix repo info, revert description
SYMSCAE File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| name: Build and Publish Docs on Dispatch | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| get-python-version: | ||
| uses: scikit-package/release-scripts/.github/workflows/_get-python-version-latest.yml@v0 | ||
| with: | ||
| python_version: 0 | ||
|
|
||
| docs: | ||
| uses: scikit-package/release-scripts/.github/workflows/_release-docs.yml@v0 | ||
| with: | ||
| project: diffpy.distanceprinter | ||
| c_extension: false | ||
| headless: false | ||
| python_version: ${{ fromJSON(needs.get-python-version.outputs.latest_python_version) }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,76 @@ | ||
| name: Release (GitHub/PyPI) and Deploy Docs | ||
| name: Build Wheel and Release | ||
|
|
||
| # Trigger on tag push or manual dispatch. | ||
| # Tag and release privilege are verified inside the reusable workflow. | ||
| on: | ||
| workflow_dispatch: | ||
| push: | ||
| tags: | ||
| - "*" # Trigger on all tags initially, but tag and release privilege are verified in _build-wheel-release-upload.yml | ||
| - "*" | ||
|
|
||
| # ── Release modality ────────────────────────────────────────────────────────── | ||
| # Three options are provided below. Only ONE job should be active at a time. | ||
| # To switch: comment out the active job and uncomment your preferred option, | ||
| # then commit the change to main before tagging a release. | ||
| # ───────────────────────────────────────────────────────────────────────────── | ||
|
|
||
| jobs: | ||
| # Option 1 (default): Release to GitHub, publish to PyPI, and deploy docs. | ||
| # | ||
| # The wheel is uploaded to PyPI so users can install with `pip install`. | ||
| # A GitHub release is created with the changelog as the release body, and | ||
| # the Sphinx documentation is rebuilt and deployed to GitHub Pages. | ||
| # | ||
| # Choose this for open-source packages distributed via PyPI and/or | ||
| # conda-forge where broad public availability is the goal. | ||
| build-release: | ||
| uses: scikit-package/release-scripts/.github/workflows/_build-wheel-release-upload.yml@v0 | ||
| with: | ||
| project: diffpy.distanceprinter | ||
| c_extension: false | ||
| maintainer_GITHUB_username: sbillinge | ||
| maintainer_github_username: sbillinge, bobleesj | ||
| secrets: | ||
| PYPI_TOKEN: ${{ secrets.PYPI_TOKEN }} | ||
| PAT_TOKEN: ${{ secrets.PAT_TOKEN }} | ||
|
|
||
| # Option 2: Release to GitHub and deploy docs, without publishing to PyPI. | ||
| # | ||
| # A GitHub release is created and the Sphinx docs are deployed, but the | ||
| # wheel is not uploaded to PyPI. The source code remains publicly visible | ||
| # on GitHub and can be installed directly from there. | ||
| # | ||
| # Choose this when the package is public but you prefer to keep it off the | ||
| # default pip index — for example, if you distribute via conda-forge only, | ||
| # or if the package is not yet ready for a permanent PyPI presence. | ||
| # | ||
| # To use: comment out Option 1 above and uncomment the lines below. | ||
| # build-release-no-pypi: | ||
| # uses: scikit-package/release-scripts/.github/workflows/_build-release-github-no-pypi.yml@v0 | ||
| # with: | ||
| # project: diffpy.distanceprinter | ||
| # c_extension: false | ||
| # maintainer_github_username: sbillinge, bobleesj | ||
| # secrets: | ||
| # PAT_TOKEN: ${{ secrets.PAT_TOKEN }} | ||
|
|
||
| # Option 3: Release to GitHub with wheel, license, and instructions bundled | ||
| # as a downloadable zip attached to the GitHub release asset. | ||
| # | ||
| # The wheel is built and packaged together with INSTRUCTIONS.txt and the | ||
| # LICENSE file into a zip that is attached directly to the GitHub release. | ||
| # Users with access to the (private) repo download the zip, follow the | ||
| # instructions inside, and install locally with pip. No PyPI or conda-forge | ||
| # upload occurs, and no docs are deployed. | ||
| # | ||
| # Choose this for private or restricted packages where distribution must be | ||
| # controlled: only users with repo access can download the release asset, | ||
| # making the GitHub release itself the distribution channel. | ||
| # | ||
| # To use: comment out Option 1 above and uncomment the lines below. | ||
| # build-release-private: | ||
| # uses: scikit-package/release-scripts/.github/workflows/_build-release-github-private-pure.yml@v0 | ||
| # with: | ||
| # project: diffpy.distanceprinter | ||
| # maintainer_github_username: sbillinge, bobleesj | ||
| # secrets: | ||
| # PAT_TOKEN: ${{ secrets.PAT_TOKEN }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 4 additions & 4 deletions
8
...s/matrix-and-codecov-on-merge-to-main.yml → .github/workflows/matrix-and-codecov.yml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| @ECHO OFF | ||
|
|
||
| pushd %~dp0 | ||
|
|
||
| REM Command file for Sphinx documentation | ||
|
|
||
| if "%SPHINXBUILD%" == "" ( | ||
| set SPHINXBUILD=sphinx-build | ||
| ) | ||
| set SOURCEDIR=source | ||
| set BUILDDIR=build | ||
| set SPHINXPROJ=PackagingScientificPython | ||
|
|
||
| if "%1" == "" goto help | ||
|
|
||
| %SPHINXBUILD% >NUL 2>NUL | ||
| if errorlevel 9009 ( | ||
| echo. | ||
| echo.The 'sphinx-build' command was not found. Make sure you have Sphinx | ||
| echo.installed, then set the SPHINXBUILD environment variable to point | ||
| echo.to the full path of the 'sphinx-build' executable. Alternatively you | ||
| echo.may add the Sphinx directory to PATH. | ||
| echo. | ||
| echo.If you don't have Sphinx installed, grab it from | ||
| echo.http://sphinx-doc.org/ | ||
| exit /b 1 | ||
| ) | ||
|
|
||
| %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% | ||
| goto end | ||
|
|
||
| :help | ||
| %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% | ||
|
|
||
| :end | ||
| popd | ||
| @ECHO OFF | ||
| pushd %~dp0 | ||
| REM Command file for Sphinx documentation | ||
| if "%SPHINXBUILD%" == "" ( | ||
| set SPHINXBUILD=sphinx-build | ||
| ) | ||
| set SOURCEDIR=source | ||
| set BUILDDIR=build | ||
| set SPHINXPROJ=PackagingScientificPython | ||
| if "%1" == "" goto help | ||
| %SPHINXBUILD% >NUL 2>NUL | ||
| if errorlevel 9009 ( | ||
| echo. | ||
| echo.The 'sphinx-build' command was not found. Make sure you have Sphinx | ||
| echo.installed, then set the SPHINXBUILD environment variable to point | ||
| echo.to the full path of the 'sphinx-build' executable. Alternatively you | ||
| echo.may add the Sphinx directory to PATH. | ||
| echo. | ||
| echo.If you don't have Sphinx installed, grab it from | ||
| echo.http://sphinx-doc.org/ | ||
| exit /b 1 | ||
| ) | ||
| %SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% | ||
| goto end | ||
| :help | ||
| %SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% | ||
| :end | ||
| popd |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,15 +15,13 @@ Getting started | |
|
|
||
| Welcome to the ``diffpy.distanceprinter`` documentation! | ||
|
|
||
| This package is not designed to be installed independently. To get started, please visit | ||
| https://www.diffpy.org/products/xPDFsuite.html for more information about the xpdfsuite package and | ||
| download the package together with ``diffpy.xpdfsuite``. | ||
| To get started, please visit the :ref:`Getting started <getting-started>` page. | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please keep the original description of the package (the deleted lines here). |
||
|
|
||
| ======= | ||
| Authors | ||
| ======= | ||
|
|
||
| ``diffpy.distanceprinter`` is developed by Xiaohao Yang and Billinge Group members. The maintainer for this project is Simon Billinge. For a detailed list of contributors see | ||
| ``diffpy.distanceprinter`` is developed by Xiaohao Yang and Billinge Group members. This project is maintained by Simon Billinge and Billinge Group members. For a detailed list of contributors see | ||
| https://github.com/diffpy/diffpy.distanceprinter/graphs/contributors. | ||
|
|
||
| ============ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| :tocdepth: -1 | ||
|
|
||
| .. index:: license | ||
|
|
||
| License | ||
| ####### | ||
|
|
||
| OPEN SOURCE LICENSE AGREEMENT | ||
| ============================= | ||
| BSD 3-Clause License | ||
|
|
||
| Copyright (c) 2009-2025, The Trustees of Columbia University in the City of New York. | ||
| Copyright (c) 2026-present, The Contributors to the diffpy.distanceprinter project. | ||
| All Rights Reserved. | ||
|
|
||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions are met: | ||
|
|
||
| 1. Redistributions of source code must retain the above copyright notice, this | ||
| list of conditions and the following disclaimer. | ||
|
|
||
| 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| this list of conditions and the following disclaimer in the documentation | ||
| and/or other materials provided with the distribution. | ||
|
|
||
| 3. Neither the name of the copyright holder nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
|
|
||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||
| FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
| DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||
| OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
Empty file.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One more things to change here: we only need to keep Simon's github account here.