From 071fc66f38b563e9c5c81e57b1383069a871c87e Mon Sep 17 00:00:00 2001 From: Bartosz Sokorski Date: Sat, 3 Jun 2023 18:22:38 +0200 Subject: [PATCH] Remove tox (#573) --- .github/workflows/integration.yml | 32 -------------- .github/workflows/tests.yml | 5 ++- poetry.lock | 72 +------------------------------ pyproject.toml | 3 +- tox.ini | 23 ---------- 5 files changed, 7 insertions(+), 128 deletions(-) delete mode 100644 .github/workflows/integration.yml delete mode 100644 tox.ini diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml deleted file mode 100644 index 0c8ba79bd..000000000 --- a/.github/workflows/integration.yml +++ /dev/null @@ -1,32 +0,0 @@ -name: Integration - -on: - pull_request: {} - push: - branches: [main] - -jobs: - Tests: - name: ${{ matrix.os }} / ${{ matrix.python-version }} - runs-on: "${{ matrix.os }}-latest" - strategy: - matrix: - os: [Ubuntu, MacOS, Windows] - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12-dev"] - fail-fast: false - defaults: - run: - shell: bash - steps: - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - - name: Install tox - run: pip install --upgrade tox - - - name: Execute integration tests - run: tox -e integration diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca133857d..ca58cf932 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -68,8 +68,11 @@ jobs: - name: Install dependencies run: poetry install - - name: Run pytest + - name: Run tests run: poetry run python -m pytest -p no:sugar -q tests/ + - name: Run integration tests + run: poetry run python -m pytest -p no:sugar --integration -q tests/integration + - name: Run mypy run: poetry run mypy diff --git a/poetry.lock b/poetry.lock index 188056012..d1aec7113 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.5.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "attrs" @@ -41,17 +41,6 @@ test = ["filelock (>=3)", "pytest (>=6.2.4)", "pytest-cov (>=2.12)", "pytest-moc typing = ["importlib-metadata (>=5.1)", "mypy (==0.991)", "tomli", "typing-extensions (>=3.7.4.3)"] virtualenv = ["virtualenv (>=20.0.35)"] -[[package]] -name = "cachetools" -version = "5.3.1" -description = "Extensible memoizing collections and decorators" -optional = false -python-versions = ">=3.7" -files = [ - {file = "cachetools-5.3.1-py3-none-any.whl", hash = "sha256:95ef631eeaea14ba2e36f06437f36463aac3a096799e876ee55e5cdccb102590"}, - {file = "cachetools-5.3.1.tar.gz", hash = "sha256:dce83f2d9b4e1f732a8cd44af8e8fab2dbe46201467fc98b3ef8f269092bf62b"}, -] - [[package]] name = "certifi" version = "2023.5.7" @@ -74,17 +63,6 @@ files = [ {file = "cfgv-3.3.1.tar.gz", hash = "sha256:f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"}, ] -[[package]] -name = "chardet" -version = "5.1.0" -description = "Universal encoding detector for Python 3" -optional = false -python-versions = ">=3.7" -files = [ - {file = "chardet-5.1.0-py3-none-any.whl", hash = "sha256:362777fb014af596ad31334fde1e8c327dfdb076e1960d1694662d46a6917ab9"}, - {file = "chardet-5.1.0.tar.gz", hash = "sha256:0d62712b956bc154f85fb0a266e2a3c5913c2967e00348701b32411d6def31e5"}, -] - [[package]] name = "charset-normalizer" version = "3.1.0" @@ -565,25 +543,6 @@ files = [ [package.extras] plugins = ["importlib-metadata"] -[[package]] -name = "pyproject-api" -version = "1.5.1" -description = "API to interact with the python pyproject.toml based projects" -optional = false -python-versions = ">=3.7" -files = [ - {file = "pyproject_api-1.5.1-py3-none-any.whl", hash = "sha256:4698a3777c2e0f6b624f8a4599131e2a25376d90fe8d146d7ac74c67c6f97c43"}, - {file = "pyproject_api-1.5.1.tar.gz", hash = "sha256:435f46547a9ff22cf4208ee274fca3e2869aeb062a4834adfc99a4dd64af3cf9"}, -] - -[package.dependencies] -packaging = ">=23" -tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} - -[package.extras] -docs = ["furo (>=2022.12.7)", "sphinx (>=6.1.3)", "sphinx-autodoc-typehints (>=1.22,!=1.23.4)"] -testing = ["covdefaults (>=2.2.2)", "importlib-metadata (>=6)", "pytest (>=7.2.1)", "pytest-cov (>=4)", "pytest-mock (>=3.10)", "virtualenv (>=20.17.1)", "wheel (>=0.38.4)"] - [[package]] name = "pyproject-hooks" version = "1.0.0" @@ -829,33 +788,6 @@ files = [ {file = "tomli_w-1.0.0.tar.gz", hash = "sha256:f463434305e0336248cac9c2dc8076b707d8a12d019dd349f5c1e382dd1ae1b9"}, ] -[[package]] -name = "tox" -version = "4.5.2" -description = "tox is a generic virtualenv management and test command line tool" -optional = false -python-versions = ">=3.7" -files = [ - {file = "tox-4.5.2-py3-none-any.whl", hash = "sha256:f1a9541b292aa0449f6c7bb67dc0073f25f9086413c3922fe47f5168cbf7b2f4"}, - {file = "tox-4.5.2.tar.gz", hash = "sha256:ad87fb7a10ef476afb6eb7e408808057f42976ef0d30ad5fe023099ba493ce58"}, -] - -[package.dependencies] -cachetools = ">=5.3" -chardet = ">=5.1" -colorama = ">=0.4.6" -filelock = ">=3.12" -packaging = ">=23.1" -platformdirs = ">=3.5.1" -pluggy = ">=1" -pyproject-api = ">=1.5.1" -tomli = {version = ">=2.0.1", markers = "python_version < \"3.11\""} -virtualenv = ">=20.23" - -[package.extras] -docs = ["furo (>=2023.5.20)", "sphinx (>=7.0.1)", "sphinx-argparse-cli (>=1.11)", "sphinx-autodoc-typehints (>=1.23,!=1.23.4)", "sphinx-copybutton (>=0.5.2)", "sphinx-inline-tabs (>=2023.4.21)", "sphinxcontrib-towncrier (>=0.2.1a0)", "towncrier (>=22.12)"] -testing = ["build[virtualenv] (>=0.10)", "covdefaults (>=2.3)", "devpi-process (>=0.3)", "diff-cover (>=7.5)", "distlib (>=0.3.6)", "flaky (>=3.7)", "hatch-vcs (>=0.3)", "hatchling (>=1.17)", "psutil (>=5.9.5)", "pytest (>=7.3.1)", "pytest-cov (>=4.1)", "pytest-mock (>=3.10)", "pytest-xdist (>=3.3.1)", "re-assert (>=1.1)", "time-machine (>=2.9)", "wheel (>=0.40)"] - [[package]] name = "types-jsonschema" version = "4.17.0.8" @@ -967,4 +899,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more [metadata] lock-version = "2.0" python-versions = "^3.8" -content-hash = "361cb55d79865a5ac3404af368440700f47a5014a9909d6baeeef10f6f004c80" +content-hash = "664f65bb1798a4d763ad777b3d564bf0817422453b414f8a8b09187bfcee8ebc" diff --git a/pyproject.toml b/pyproject.toml index d056b47c1..7810645b6 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,6 @@ python = "^3.8" [tool.poetry.group.dev.dependencies] pre-commit = ">=2.15.0" -tox = ">=3.0" vendoring = ">=1.0" [tool.poetry.group.test.dependencies] @@ -37,13 +36,13 @@ pytest-mock = ">=3.10" build = ">=0.10.0" setuptools = ">=60" tomli-w = "^1.0.0" +virtualenv = ">=20.21" [tool.poetry.group.typing.dependencies] mypy = ">=1.0" types-jsonschema = ">=4.4.4" types-setuptools = ">=57.4.14" - [tool.ruff] fix = true unfixable = [ diff --git a/tox.ini b/tox.ini deleted file mode 100644 index 2fb181b93..000000000 --- a/tox.ini +++ /dev/null @@ -1,23 +0,0 @@ -[tox] -minversion = 3.3.0 -isolated_build = True -envlist = py37, py38, py39, py310, pypy3, integration - -[testenv] -whitelist_externals = poetry -skip_install = true -commands = - poetry install -v - poetry run pytest {posargs} tests/ - - -[testenv:integration] -basepython = python3 -skip_install = false -deps = - pytest - build - tomli_w - virtualenv -commands = - pytest --integration {posargs} tests/integration