mirror of https://github.com/zulip/zulip.git
clean-venv-cache: Handle cleaning up zulip-thumbor-venv properly.
This commit is contained in:
parent
9dba134c7a
commit
b0c0648a4f
|
@ -4,6 +4,8 @@ import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if False:
|
if False:
|
||||||
|
# Typing module isn't always available when this is run on older
|
||||||
|
# Python 3.4 (Trusty).
|
||||||
from typing import Set, Text
|
from typing import Set, Text
|
||||||
|
|
||||||
ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
ZULIP_PATH = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
||||||
|
@ -23,12 +25,16 @@ def get_caches_in_use(threshold_days):
|
||||||
setups_to_check = set([ZULIP_PATH, ])
|
setups_to_check = set([ZULIP_PATH, ])
|
||||||
caches_in_use = set()
|
caches_in_use = set()
|
||||||
|
|
||||||
|
def add_current_venv_cache(venv_name: str) -> None:
|
||||||
|
CACHE_SYMLINK = os.path.join(os.path.dirname(ZULIP_PATH), venv_name)
|
||||||
|
CURRENT_CACHE = os.path.dirname(os.path.realpath(CACHE_SYMLINK))
|
||||||
|
caches_in_use.add(CURRENT_CACHE)
|
||||||
|
|
||||||
if ENV == "prod":
|
if ENV == "prod":
|
||||||
setups_to_check |= get_recent_deployments(threshold_days)
|
setups_to_check |= get_recent_deployments(threshold_days)
|
||||||
if ENV == "dev":
|
if ENV == "dev":
|
||||||
CACHE_SYMLINK = os.path.join(os.path.dirname(ZULIP_PATH), "zulip-py3-venv")
|
add_current_venv_cache("zulip-py3-venv")
|
||||||
CURRENT_CACHE = os.path.dirname(os.path.realpath(CACHE_SYMLINK))
|
add_current_venv_cache("zulip-thumbor-venv")
|
||||||
caches_in_use.add(CURRENT_CACHE)
|
|
||||||
|
|
||||||
for path in setups_to_check:
|
for path in setups_to_check:
|
||||||
reqs_dir = os.path.join(path, "requirements")
|
reqs_dir = os.path.join(path, "requirements")
|
||||||
|
|
Loading…
Reference in New Issue