-
Notifications
You must be signed in to change notification settings - Fork 209
attempt to fix tox on bcrypt CI #953
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
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8ab5f48
attempt to fix tox on bcrypt CI
ngoldbaum a591dc6
fix mypy, pep8, and packaging environments
ngoldbaum 9377ea6
delete Mac CI TOXENV uses as well
ngoldbaum de1f056
restore setting TOXENV in linux CI
ngoldbaum 236a006
use TOXENV in environment name if defined
ngoldbaum 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,9 +14,9 @@ jobs: | |
| fail-fast: false | ||
| matrix: | ||
| PYTHON: | ||
| - {VERSION: "3.8", TOXENV: "py38"} | ||
| - {VERSION: "3.13", TOXENV: "py313"} | ||
| - {VERSION: "3.13t", TOXENV: "py313"} | ||
| - {VERSION: "3.8"} | ||
| - {VERSION: "3.13"} | ||
| - {VERSION: "3.13t"} | ||
| MACOS: | ||
| - macos-13 | ||
| - macos-latest | ||
|
|
@@ -39,9 +39,8 @@ jobs: | |
| src/_bcrypt/target/ | ||
| key: ${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-cargo-${{ hashFiles('**/Cargo.lock') }} | ||
| - run: pip install tox | ||
| - run: tox | ||
| - run: tox --discover $(which python) | ||
| env: | ||
| TOXENV: ${{ matrix.PYTHON.TOXENV }} | ||
| CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }} | ||
|
|
||
| windows: | ||
|
|
@@ -52,9 +51,9 @@ jobs: | |
| - {ARCH: 'x86', WINDOWS: 'win32', RUST_TRIPLE: 'i686-pc-windows-msvc'} | ||
| - {ARCH: 'x64', WINDOWS: 'win64', RUST_TRIPLE: 'x86_64-pc-windows-msvc'} | ||
| PYTHON: | ||
| - {VERSION: "3.8", TOXENV: "py38"} | ||
| - {VERSION: "3.13", TOXENV: "py313"} | ||
| - {VERSION: "3.13t", TOXENV: "py313"} | ||
| - {VERSION: "3.8"} | ||
| - {VERSION: "3.13"} | ||
| - {VERSION: "3.13t"} | ||
| name: "Python ${{ matrix.PYTHON.VERSION }} on ${{ matrix.WINDOWS.WINDOWS }}" | ||
| steps: | ||
| - uses: actions/[email protected] | ||
|
|
@@ -77,9 +76,8 @@ jobs: | |
| key: ${{ runner.os }}-${{ matrix.WINDOWS.ARCH }}-${{ steps.setup-python.outputs.python-version }}-cargo-${{ hashFiles('**/Cargo.lock') }} | ||
|
|
||
| - run: pip install tox | ||
| - run: tox | ||
| - run: tox --discover $(which python) | ||
| env: | ||
| TOXENV: ${{ matrix.PYTHON.TOXENV }} | ||
| CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }} | ||
| linux: | ||
| runs-on: ubuntu-22.04 | ||
|
|
@@ -88,21 +86,21 @@ jobs: | |
| PYTHON: | ||
| - {VERSION: "3.13", TOXENV: "pep8,packaging"} | ||
| - {VERSION: "3.13", TOXENV: "mypy"} | ||
| - {VERSION: "3.8", TOXENV: "py38"} | ||
| - {VERSION: "3.9", TOXENV: "py39"} | ||
| - {VERSION: "3.10", TOXENV: "py310"} | ||
| - {VERSION: "3.11", TOXENV: "py311"} | ||
| - {VERSION: "3.12", TOXENV: "py312"} | ||
| - {VERSION: "3.13", TOXENV: "py313"} | ||
| - {VERSION: "3.13t", TOXENV: "py313"} | ||
| - {VERSION: "pypy-3.9", TOXENV: "pypy3"} | ||
| - {VERSION: "pypy-3.10", TOXENV: "pypy3"} | ||
| - {VERSION: "3.8"} | ||
| - {VERSION: "3.9"} | ||
| - {VERSION: "3.10"} | ||
| - {VERSION: "3.11"} | ||
| - {VERSION: "3.12"} | ||
| - {VERSION: "3.13"} | ||
| - {VERSION: "3.13t"} | ||
| - {VERSION: "pypy-3.9"} | ||
| - {VERSION: "pypy-3.10"} | ||
|
|
||
| # MSRV | ||
| - {VERSION: "3.13", TOXENV: "py313", RUST_VERSION: "1.64.0"} | ||
| - {VERSION: "3.13", TOXENV: "py313", RUST_VERSION: "beta"} | ||
| - {VERSION: "3.13", TOXENV: "py313", RUST_VERSION: "nightly"} | ||
| name: "${{ matrix.PYTHON.VERSION }} on linux, Rust ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}" | ||
| - {VERSION: "3.13", RUST_VERSION: "1.64.0"} | ||
| - {VERSION: "3.13", RUST_VERSION: "beta"} | ||
| - {VERSION: "3.13", RUST_VERSION: "nightly"} | ||
| name: "${{ matrix.PYTHON.TOXENV || matrix.PYTHON.VERSION }} on linux, Rust ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}" | ||
| steps: | ||
| - uses: actions/[email protected] | ||
| - name: Setup python | ||
|
|
@@ -126,7 +124,7 @@ jobs: | |
| toolchain: ${{ matrix.PYTHON.RUST_VERSION || 'stable' }} | ||
|
|
||
| - run: pip install tox | ||
| - run: tox | ||
| - run: tox --discover $(which python) | ||
| env: | ||
| TOXENV: ${{ matrix.PYTHON.TOXENV }} | ||
| CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }} | ||
|
|
||
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.
but without this, the toxenv for mypy, pep8, packaging isn't respected :-/
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.
Ugh, sorry for all the back-and-forth. Should be fixed now, I think.
I also noticed that the information about these environments wasn't showing up in the actions environment name - so I added it back.