Skip to content

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.

Sign up for GitHub

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
ngoldbaum wants to merge 5 commits into from
Closed

attempt to fix tox on bcrypt CI #953

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8ab5f48
attempt to fix tox on bcrypt CI
ngoldbaum Jan 16, 2025
a591dc6
fix mypy, pep8, and packaging environments
ngoldbaum Jan 16, 2025
9377ea6
delete Mac CI TOXENV uses as well
ngoldbaum Jan 16, 2025
de1f056
restore setting TOXENV in linux CI
ngoldbaum Jan 16, 2025
236a006
use TOXENV in environment name if defined
ngoldbaum Jan 16, 2025
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
45 changes: 21 additions & 24 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
PYTHON:
- {VERSION: "3.8", TOXENV: "py38"}
- {VERSION: "3.13", TOXENV: "py313"}
- {VERSION: "3.13t", TOXENV: "py313"}
- {VERSION: "3.13t", TOXENV: "py313t"}
Copy link
Member

@alex alex Jan 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These TOXENVs aren't used anymore, right?

MACOS:
- macos-13
- macos-latest
Expand All @@ -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:
Expand All @@ -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/checkout@v4.2.2
Expand All @@ -77,31 +76,30 @@ 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
strategy:
matrix:
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.13"}
- {VERSION: "3.13"}
- {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"}
- {VERSION: "3.13", RUST_VERSION: "1.64.0"}
- {VERSION: "3.13", RUST_VERSION: "beta"}
- {VERSION: "3.13", RUST_VERSION: "nightly"}
name: "${{ matrix.PYTHON.VERSION }} on linux, Rust ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}"
steps:
- uses: actions/checkout@v4.2.2
Expand All @@ -126,9 +124,8 @@ jobs:
toolchain: ${{ matrix.PYTHON.RUST_VERSION || 'stable' }}

- run: pip install tox
- run: tox
- run: tox --discover $(which python)
env:
TOXENV: ${{ matrix.PYTHON.TOXENV }}
Copy link
Member

@alex alex Jan 16, 2025

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 :-/

Copy link
Contributor Author

@ngoldbaum ngoldbaum Jan 16, 2025

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.

CARGO_TARGET_DIR: ${{ format('{0}/src/_bcrypt/target/', github.workspace) }}

linux-distros:
Expand Down
Loading