diff options
| author | Adam King <47704447+adk3798@users.noreply.github.com> | 2024-03-27 15:51:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-27 15:51:09 +0100 |
| commit | 56104de36be0c2f85537fb15e778642634198fab (patch) | |
| tree | 25bbed611a96db8afadc20cc6ad17bfa11a57a7c /src/cephadm | |
| parent | Merge pull request #56449 from afreen23/wip-security (diff) | |
| parent | cephadm: add format-black reminder comment (diff) | |
| download | ceph-56104de36be0c2f85537fb15e778642634198fab.tar.xz ceph-56104de36be0c2f85537fb15e778642634198fab.zip | |
Merge pull request #56304 from phlogistonjohn/jjm-tox-default-envs
python: allow unit tests to use tox default envs
Reviewed-by: Adam King <adking@redhat.com>
Diffstat (limited to 'src/cephadm')
| -rw-r--r-- | src/cephadm/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/cephadm/tox.ini | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/cephadm/CMakeLists.txt b/src/cephadm/CMakeLists.txt index c33572dd4ef..c8b7c74a985 100644 --- a/src/cephadm/CMakeLists.txt +++ b/src/cephadm/CMakeLists.txt @@ -1,6 +1,6 @@ if(WITH_TESTS) include(AddCephTest) - add_tox_test(cephadm TOX_ENVS py3 mypy flake8) + add_tox_test(cephadm TOX_ENVS __tox_defaults__) endif() set(bin_target_file ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cephadm) diff --git a/src/cephadm/tox.ini b/src/cephadm/tox.ini index a6b2601c76e..8ad1d297f38 100644 --- a/src/cephadm/tox.ini +++ b/src/cephadm/tox.ini @@ -5,6 +5,8 @@ envlist = check-black py3 skipsdist = true +# REMINDER: run `tox -e format-black` to apply black formatting +# with the exact same specs as `check-black` expects. [flake8] max-line-length = 100 @@ -21,15 +23,6 @@ exclude = .eggs statistics = True -[autopep8] -addopts = - --max-line-length {[flake8]max-line-length} \ - --ignore "{[flake8]ignore}" \ - --exclude "{[flake8]exclude}" \ - --in-place \ - --recursive \ - --ignore-local-config - [testenv] skip_install=true deps = |