Skip to content

Commit

Permalink
Merge branch 'main' into ci-set-output
Browse files Browse the repository at this point in the history
  • Loading branch information
santisoler committed Sep 5, 2024
2 parents 99447f3 + f2c634e commit d3491c8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Publish to Test PyPI
# Only publish to TestPyPI when a PR is merged (pushed to main)
if: success() && github.event_name == 'push'
uses: pypa/gh-action-pypi-publish@v1.9.0
uses: pypa/gh-action-pypi-publish@v1.10.0
with:
repository_url: https://test.pypi.org/legacy/
# Allow existing releases on test PyPI without errors.
Expand All @@ -124,4 +124,4 @@ jobs:
- name: Publish to PyPI
# Only publish to PyPI when a release triggers the build
if: success() && github.event_name == 'release'
uses: pypa/gh-action-pypi-publish@v1.9.0
uses: pypa/gh-action-pypi-publish@v1.10.0
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ Are you a **scientist** or researcher? Pooch can help you too!
[Py-ART](https://github.com/ARM-DOE/pyart),
[HyperSpy](https://github.com/hyperspy/hyperspy),
[RosettaSciIO](https://github.com/hyperspy/rosettasciio),
[eXSpy](https://github.com/hyperspy/exspy)
[eXSpy](https://github.com/hyperspy/exspy),
[SPLASH](https://github.com/Adam-Boesky/astro_SPLASH)


> If you're using Pooch, **send us a pull request** adding your project to the list.
Expand Down
5 changes: 3 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ dependencies:
# Optional dependencies
- tqdm>=4.41.0,<5.0.0
- paramiko>=2.7.0
- xxhash>=1.4.3
- python-xxhash>=1.4.3 # in conda-forge python-xxhash is the python pkg
- xxhash # this is the xxHash library in conda-forge
# Build
- build
- python-build
# Test
- pytest
- pytest-cov
Expand Down

0 comments on commit d3491c8

Please sign in to comment.