diff --git a/.github/workflows/docs_dev.yml b/.github/workflows/docs_dev.yml index 9583f6fef..9e1c93204 100644 --- a/.github/workflows/docs_dev.yml +++ b/.github/workflows/docs_dev.yml @@ -17,7 +17,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -U virtualenv setuptools wheel 'tox<4' + pip install -U virtualenv setuptools wheel tox sudo apt-get install graphviz pandoc - name: Build and publish env: diff --git a/.github/workflows/docs_release.yml b/.github/workflows/docs_release.yml index b52fac7a7..26aed1433 100644 --- a/.github/workflows/docs_release.yml +++ b/.github/workflows/docs_release.yml @@ -18,7 +18,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install -U virtualenv setuptools wheel 'tox<4' + pip install -U virtualenv setuptools wheel tox sudo apt-get install graphviz pandoc - name: Build and publish env: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 982bb3633..6fe794ef4 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ jobs: toolchain: ${{ matrix.rust }} targets: ${{ matrix.platform.rust-target }} - name: 'Install dependencies' - run: python -m pip install --upgrade 'tox<4' + run: python -m pip install --upgrade tox - name: 'Install binary dependencies' run: sudo apt-get install -y graphviz if: runner.os == 'Linux' @@ -103,7 +103,7 @@ jobs: - name: Install Rust toolchain uses: dtolnay/rust-toolchain@stable - name: 'Install dependencies' - run: python -m pip install --upgrade 'tox<4' + run: python -m pip install --upgrade tox - name: 'Run rustworkx stub tests' run: tox -estubs tests_retworkx_compat: @@ -132,7 +132,7 @@ jobs: toolchain: ${{ matrix.rust }} targets: ${{ matrix.platform.rust-target }} - name: 'Install dependencies' - run: python -m pip install --upgrade 'tox<4' + run: python -m pip install --upgrade tox - name: 'Install binary dependencies' run: sudo apt-get install -y graphviz if: runner.os == 'Linux' @@ -202,7 +202,7 @@ jobs: - name: Install binary deps run: sudo apt-get install -y graphviz - name: Install deps - run: pip install -U 'tox<4' + run: pip install -U tox - name: Build Docs run: tox -edocs - uses: actions/upload-artifact@v3 diff --git a/tox.ini b/tox.ini index 77451c244..80cd1304e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,10 @@ [tox] -minversion = 2.1 +minversion = 4.4.0 envlist = py37, py38, py39, py310, py311, lint isolated_build = true [testenv] -install_command = pip install -c{toxinidir}/constraints.txt -U {opts} {packages} +install_command = python -I -m pip install -c{toxinidir}/constraints.txt -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} LANGUAGE=en_US @@ -19,14 +19,15 @@ deps = extras = mpl graphviz -passenv = RETWORKX_TEST_PRESERVE_IMAGES RUSTWORKX_PKG_NAME +passenv = + RETWORKX_TEST_PRESERVE_IMAGES + RUSTWORKX_PKG_NAME changedir = {toxinidir}/tests commands = stestr run {posargs} [testenv:lint] basepython = python3 -envdir = .tox/lint deps = black~=22.0 flake8 @@ -44,7 +45,10 @@ setenv = {[testenv]setenv} deps = -r {toxinidir}/docs/source/requirements.txt -passenv = {[testenv]passenv} RETWORKX_DEV_DOCS RETWORKX_LEGACY_DOCS +passenv = + {[testenv]passenv} + RETWORKX_DEV_DOCS + RETWORKX_LEGACY_DOCS changedir = {toxinidir}/docs commands = python -m ipykernel install --user @@ -53,14 +57,12 @@ commands = [testenv:black] basepython = python3 -envdir = .tox/lint deps = black~=22.0 commands = black {posargs} '../rustworkx' '../tests' '../retworkx' [testenv:stubs] basepython = python3 -envdir = .tox/stubs deps = mypy==1.0.1 commands = python -m mypy.stubtest --concise --ignore-missing-stub rustworkx.rustworkx