Skip to content

Commit

Permalink
Merge branch 'main' into update-cookiecutter
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/bump-version.yml
#	.github/workflows/first-pull-request.yml
#	.github/workflows/main.yml
#	.github/workflows/publish-pypi.yml
#	.github/workflows/tag-testpypi.yml
  • Loading branch information
Zeitsperre committed Feb 1, 2024
2 parents b5abd34 + 2075735 commit aaa5f65
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
files.pythonhosted.org:443
github.com:443
pypi.org:443
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
with:
persist-credentials: false
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5.0.0
with:
python-version: "3.9"
- name: Config Commit Bot
Expand All @@ -80,7 +80,7 @@ jobs:
bump-my-version show new_version --increment patch
fi
- name: Push Changes
uses: ad-m/github-push-action@master
uses: ad-m/github-push-action@v0.8.0
with:
force: false
github_token: ${{ secrets.BUMP_VERSION_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/first-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
allowed-endpoints: >
api.github.com:443
- uses: actions/github-script@v6
- uses: actions/github-script@v7.0.1
with:
script: |
// Get a list of all issues created by the PR opener
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Set up Python${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5.0.0
with:
python-version: ${{ matrix.python-version }}
- name: Install tox
Expand Down Expand Up @@ -62,9 +62,9 @@ jobs:
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
with:
egress-policy: audit
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Setup Conda (Micromamba) with Python${{ matrix.python-version }}
uses: mamba-org/setup-micromamba@v1
uses: mamba-org/setup-micromamba@v1.8.0
with:
cache-downloads: true
environment-file: environment-dev.yml
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/publish-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
with:
egress-policy: audit
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Python3
uses: actions/setup-python@v4
uses: actions/setup-python@v5.0.0
with:
python-version: "3.9"
- name: Install packaging libraries
Expand All @@ -33,4 +33,4 @@ jobs:
run: |
python -m flit build
- name: Publish distribution 📦 to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@v1.8.11
8 changes: 4 additions & 4 deletions .github/workflows/tag-testpypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
egress-policy: audit
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
- name: Create Release
uses: softprops/action-gh-release@v1
env:
Expand All @@ -45,9 +45,9 @@ jobs:
uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
with:
egress-policy: audit
- uses: actions/checkout@v4
- uses: actions/checkout@v4.1.1
- name: Set up Python3
uses: actions/setup-python@v4
uses: actions/setup-python@v5.0.0
with:
python-version: "3.9"
- name: Install packaging libraries
Expand All @@ -57,7 +57,7 @@ jobs:
run: |
python -m flit build
- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@release/v1
uses: pypa/gh-action-pypi-publish@v1.8.11
with:
repository-url: https://test.pypi.org/legacy/
skip-existing: true

0 comments on commit aaa5f65

Please sign in to comment.