Skip to content

Commit

Permalink
Revert "feat: Write CACHEDIR.TAG file (#2803)"
Browse files Browse the repository at this point in the history
This reverts commit be19526.
  • Loading branch information
gaborbernat committed Nov 26, 2024
1 parent f5d7cb4 commit 6f70bf5
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 89 deletions.
1 change: 0 additions & 1 deletion docs/changelog/2803.feature.rst

This file was deleted.

22 changes: 0 additions & 22 deletions src/virtualenv/create/creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import logging
import os
import sys
import textwrap
from abc import ABC, abstractmethod
from argparse import ArgumentTypeError
from ast import literal_eval
Expand Down Expand Up @@ -158,31 +157,10 @@ def run(self):
LOGGER.debug("delete %s", self.dest)
safe_delete(self.dest)
self.create()
self.add_cachedir_tag()
self.set_pyenv_cfg()
if not self.no_vcs_ignore:
self.setup_ignore_vcs()

def add_cachedir_tag(self):
"""
Add a Cache Directory Tag file "CACHEDIR.TAG".
The CACHEDIR.TAG file is used by various tools to mark
a directory as cache, so that it can be handled differently.
Some backup tools look for this file to exclude the directory.
See https://bford.info/cachedir/ for more details.
"""
cachedir_tag_file = self.dest / "CACHEDIR.TAG"
if not cachedir_tag_file.exists():
cachedir_tag_text = textwrap.dedent("""
Signature: 8a477f597d28d172789f06886806bc55
# This file is a cache directory tag created by Python virtualenv.
# For information about cache directory tags, see:
# http://www.brynosaurus.com/cachedir/
""").strip()
cachedir_tag_file.write_text(cachedir_tag_text, encoding="utf-8")

def set_pyenv_cfg(self):
self.pyenv_cfg.content = OrderedDict()
self.pyenv_cfg["home"] = os.path.dirname(os.path.abspath(self.interpreter.system_executable))
Expand Down
37 changes: 0 additions & 37 deletions tests/integration/test_cachedir_tag.py

This file was deleted.

29 changes: 0 additions & 29 deletions tests/unit/create/test_creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import stat
import subprocess
import sys
import textwrap
import zipfile
from collections import OrderedDict
from itertools import product
Expand Down Expand Up @@ -224,34 +223,6 @@ def list_to_str(iterable):
assert git_ignore.splitlines() == [comment, "*"]


def test_create_cachedir_tag(tmp_path):
cachedir_tag_file = tmp_path / "CACHEDIR.TAG"
cli_run([str(tmp_path), "--without-pip", "--activators", ""])
assert (
cachedir_tag_file.read_text(encoding="utf-8")
== textwrap.dedent("""
Signature: 8a477f597d28d172789f06886806bc55
# This file is a cache directory tag created by Python virtualenv.
# For information about cache directory tags, see:
# http://www.brynosaurus.com/cachedir/
""").strip()
)


def test_create_cachedir_tag_exists(tmp_path):
cachedir_tag_file = tmp_path / "CACHEDIR.TAG"
cachedir_tag_file.write_text("magic", encoding="utf-8")
cli_run([str(tmp_path), "--without-pip", "--activators", ""])
assert cachedir_tag_file.read_text(encoding="utf-8") == "magic"


def test_create_cachedir_tag_exists_override(tmp_path):
cachedir_tag_file = tmp_path / "CACHEDIR.TAG"
cachedir_tag_file.write_text("magic", encoding="utf-8")
cli_run([str(tmp_path), "--without-pip", "--activators", ""])
assert cachedir_tag_file.read_text(encoding="utf-8") == "magic"


def test_create_vcs_ignore_exists(tmp_path):
git_ignore = tmp_path / ".gitignore"
git_ignore.write_text("magic", encoding="utf-8")
Expand Down

0 comments on commit 6f70bf5

Please sign in to comment.