Skip to content
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

refactor: use Python 3.12 as default version #23

Merged
merged 1 commit into from
Feb 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions .github/workflows/pip-compile-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
Python version to use for installing pip-tools.
required: false
type: string
default: '2.7'
default: '3.12'
pr-create:
description: >-
Whether to create a Pull Request.
Expand Down Expand Up @@ -77,12 +77,22 @@ jobs:
passphrase: ${{ secrets.gpg-sign-passphrase }}
private-key: ${{ secrets.gpg-sign-private-key }}

- name: Build commit message
if: ${{ steps.git-diff.outputs.diff == 'true' }}
run: |
echo "${{ inputs.pr-commit-message }}" > "$RUNNER_TEMP/commit.txt"
{
echo ""
echo "updates:"
git status --porcelain | awk 'match($1, "M") {print " - " $2}'
} >> "$RUNNER_TEMP/commit.txt"

- name: Commit and push changes
if: ${{ steps.git-diff.outputs.diff == 'true' && inputs.pr-create == 'yes' }}
run: |
git checkout -B coatl-dev-pip-compile-upgrade
git add ${{ inputs.path }}
git commit -m "${{ inputs.pr-commit-message }}"
git commit --file="${RUNNER_TEMP}/commit.txt"
git push --force --set-upstream origin coatl-dev-pip-compile-upgrade

- name: Create pull request
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pre-commit-autoupdate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ jobs:
- name: Checkout repo
uses: actions/checkout@v4

- name: Set up Python 3.11
- name: Set up Python
uses: actions/setup-python@v5
id: setup-python
with:
python-version: '3.11'
python-version: '3.12'

- name: Checkout repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/setup-python@v5
id: setup-python
with:
python-version: '3.11'
python-version: '3.12'

- name: Checkout repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-python@v5
id: setup-python
with:
python-version: '3.11'
python-version: '3.12'

- name: Checkout repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
description: Version of Python to use.
required: false
type: string
default: '3.11'
default: '3.12'
check:
description: Check metadata with twine before uploading.
required: false
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/tox-docker.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
on:
workflow_call:
inputs:
python-version:
description: >-
Python version to use for installing pip-tools.
required: false
type: string
default: '3.12'

jobs:
tox:
runs-on: ubuntu-22.04
container: coatldev/six:3.11
container: coatldev/six:${{ inputs.python-version }}
steps:
- name: Checkout repo
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
uses: actions/setup-python@v5
id: setup-python
with:
python-version: '3.11'
python-version: '3.12'

- name: Checkout repo
uses: actions/checkout@v4
Expand Down
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ requirements.

- `path` (`string`): A file or location of the requirement file(s).
- `python-version` (`string`): Python version to use for installing `pip-tools`.
You may use MAJOR.MINOR or exact version. Defaults to `'2.7'`. Optional.
You may use MAJOR.MINOR or exact version. Defaults to `'3.12'`. Optional.
- `pr-create` (`string`): Whether to create a Pull Request. Options: `'yes'`,
`'no'`. Defaults to `'yes'`. Optional.
- `pr-commit-message` (`string`): Use the given message as the commit message.
Expand Down Expand Up @@ -160,7 +160,7 @@ PyPI (or any other repository) using `build` and `twine`.

- `python-version` (`string`): The Python version to use for building and
publishing the package. You may use MAJOR.MINOR or exact version. Defaults to
`'3.11'`. Optional
`'3.12'`. Optional
- `check` (`boolean`): Check metadata with twine before uploading. Defaults to
`true`. Optional.
- `url` (`string`): The repository (package index) URL to upload the package to.
Expand Down Expand Up @@ -190,10 +190,16 @@ jobs:
This workflow will install the latest version of `tox` to run all envs found in
[`env_list`].

**Inputs**:

- `python-version` (`string`): The Python version to use for building and
publishing the package. You may use MAJOR.MINOR or exact version. Defaults to
`'3.12'`. Optional

**Notes**:

- This workflow uses the [`coatldev/six:3.11`] Docker image, which comes with
Python 2.7 and 3.11.
- This workflow uses the [`coatldev/six:3.12`] Docker image, which comes with
Python 2.7 and 3.12.

**Example**:

Expand Down Expand Up @@ -296,7 +302,7 @@ jobs:
```

[`actions/setup-python`]: https://github.com/actions/setup-python
[`coatldev/six:3.11`]: https://hub.docker.com/r/coatldev/six
[`coatldev/six:3.12`]: https://hub.docker.com/r/coatldev/six
[`env_list`]: https://tox.wiki/en/latest/config.html#env_list
[`local hooks`]: https://pre-commit.com/#repository-local-hooks
[`pre-commit`]: https://pre-commit.com/
Expand Down