diff --git a/.github/workflows/test-ci.yml b/.github/workflows/test-ci.yml index 53d6df355..7342818e8 100644 --- a/.github/workflows/test-ci.yml +++ b/.github/workflows/test-ci.yml @@ -27,6 +27,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - python -m pip install tox tox-gh-actions - - name: Test with tox - run: tox + python -m pip install pytest + - name: Run tests + run: python -m pytest diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 671a43fe2..b9aa58b52 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,17 +43,12 @@ probably need to split up your commit to finer grained pieces. Lint any changes by running: ```sh -$ tox -e lint -- file.py +$ flake8 ``` And format with: ```sh -$ tox -e format -- file.py -``` - -Or format everything: -```sh -$ tox -e format +$ black file.py ``` Repo uses [black](https://black.readthedocs.io/) with line length of 80 as its @@ -73,15 +68,11 @@ the entire project in the included `.flake8` file. [PEP 8]: https://www.python.org/dev/peps/pep-0008/ [flake8 documentation]: https://flake8.pycqa.org/en/3.1.1/user/ignoring-errors.html#in-line-ignoring-errors + ## Running tests -We use [pytest](https://pytest.org/) and [tox](https://tox.readthedocs.io/) for -running tests. You should make sure to install those first. - -To run the full suite against all supported Python versions, simply execute: -```sh -$ tox -p auto -``` +We use [pytest](https://pytest.org/) for running tests. You should make sure to +install that first. We have [`./run_tests`](./run_tests) which is a simple wrapper around `pytest`: ```sh diff --git a/pyproject.toml b/pyproject.toml index ffeab4b3c..141e81bcc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -14,7 +14,6 @@ [tool.black] line-length = 80 -# NB: Keep in sync with tox.ini. target-version = ['py36', 'py37', 'py38', 'py39', 'py310', 'py311'] #, 'py312' [tool.pytest.ini_options] diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 55c0de8ca..000000000 --- a/tox.ini +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# https://tox.readthedocs.io/ - -[tox] -envlist = lint, py36, py37, py38, py39, py310, py311, py312 -requires = virtualenv<20.22.0 - -[gh-actions] -python = - 3.6: py36 - 3.7: py37 - 3.8: py38 - 3.9: py39 - 3.10: py310 - 3.11: py311 - 3.12: py312 - -[testenv] -deps = - -c constraints.txt - black - flake8 - isort - pytest - pytest-timeout -commands = {envpython} run_tests {posargs} -setenv = - GIT_AUTHOR_NAME = Repo test author - GIT_COMMITTER_NAME = Repo test committer - EMAIL = repo@gerrit.nodomain - -[testenv:lint] -skip_install = true -deps = - -c constraints.txt - black - flake8 -commands = - black --check {posargs:. repo run_tests release/update-hooks release/update-manpages} - flake8 - -[testenv:format] -skip_install = true -deps = - -c constraints.txt - black - flake8 -commands = - black {posargs:. repo run_tests release/update-hooks release/update-manpages} - flake8