Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ jobs:
DIFF_AGAINST: HEAD
- name: Rename coverage report file
run: |
import os; os.rename('.tox/4/coverage.{}.xml'.format(os.environ['TOXENV']), '.tox/4/coverage.xml')
import os; os.rename('.tox/coverage.{}.xml'.format(os.environ['TOXENV']), '.tox/coverage.xml')
shell: python
- uses: codecov/codecov-action@v1
with:
file: ./.tox/4/coverage.xml
file: ./.tox/coverage.xml
flags: tests
name: ${{ matrix.py }} - ${{ matrix.os }}

Expand Down
1 change: 1 addition & 0 deletions docs/changelog/2346.feature.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use ``.tox`` as working directory instead of ``.tox/4`` - by :user:`gaborbernat`.
3 changes: 1 addition & 2 deletions src/tox/config/sets.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ def register_config(self) -> None:
)

def work_dir_builder(conf: Config, env_name: str | None) -> Path: # noqa: U100
# here we pin to .tox/4 to be able to use in parallel with v3 until final release
return (conf.work_dir if conf.work_dir is not None else cast(Path, self["tox_root"])) / ".tox" / "4"
return (conf.work_dir if conf.work_dir is not None else cast(Path, self["tox_root"])) / ".tox"

self.add_config(
keys=["work_dir", "toxworkdir"],
Expand Down
2 changes: 1 addition & 1 deletion tests/session/cmd/test_sequential.py
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ def test_sequential_inserted_env_vars(tox_project: ToxProjectCreator, demo_pkg_i

assert re.search(f"TOX_PACKAGE={re.escape(str(project.path))}.*.tar.gz{os.linesep}", result.out)
assert f"TOX_ENV_NAME=py{os.linesep}" in result.out
work_dir = project.path / ".tox" / "4"
work_dir = project.path / ".tox"
assert f"TOX_WORK_DIR={work_dir}{os.linesep}" in result.out
env_dir = work_dir / "py"
assert f"TOX_ENV_DIR={env_dir}{os.linesep}" in result.out
Expand Down
2 changes: 1 addition & 1 deletion tests/tox_env/test_tox_env_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def test_env_log(tox_project: ToxProjectCreator) -> None:
result_first = prj.run("r")
result_first.assert_success()

log_dir = prj.path / ".tox" / "4" / "py" / "log"
log_dir = prj.path / ".tox" / "py" / "log"
assert log_dir.exists(), result_first.out

filename = {i.name for i in log_dir.iterdir()}
Expand Down