Skip to content

Commit

Permalink
Use format_link(…) as suggested by @skshetry, vs {blue}/{nc}.
Browse files Browse the repository at this point in the history
Since I'd pulled the old syntax out of repo/init.py, I've fixed that up
as well so no one makes that mistake again. Note that this adds <>s around
the link text, unlike before:

+---------------------------------------------------------------------+
|                                                                     |
|        DVC has enabled anonymous aggregate usage analytics.         |
|     Read the analytics documentation (and how to opt-out) here:     |
|             <https://dvc.org/doc/user-guide/analytics>              |
|                                                                     |
+---------------------------------------------------------------------+

This is probably fine, since if we're going to have a standard link format
we might as well stick with it consistently. If we don't like it, we can
change format_link() I guess.
  • Loading branch information
DDR0 committed Sep 24, 2020
1 parent 1a3764f commit 26963e4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 16 deletions.
7 changes: 3 additions & 4 deletions dvc/command/status.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import logging

import colorama

from dvc.command.data_sync import CmdDataBase
from dvc.exceptions import DvcException
from dvc.utils import format_link

logger = logging.getLogger(__name__)

Expand All @@ -14,8 +13,8 @@ class CmdDataStatus(CmdDataBase):
UP_TO_DATE_MSG = "Data and pipelines are up to date."
EMPTY_PROJECT_MSG = (
"There is no data tracked in this project yet.\n"
"See {bl}https://dvc.org/doc/start/data-versioning{nc} to get started!"
).format(bl=colorama.Fore.BLUE, nc=colorama.Fore.RESET)
"See {link} to get started!"
).format(link=format_link("https://dvc.org/doc/start/data-versioning"))

def _normalize(self, s):
s += ":"
Expand Down
20 changes: 8 additions & 12 deletions dvc/repo/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
from dvc.repo import Repo
from dvc.scm import SCM
from dvc.scm.base import SCMError
from dvc.utils import boxify, relpath
from dvc.utils import boxify
from dvc.utils import format_link as fmt_link
from dvc.utils import relpath
from dvc.utils.fs import remove

logger = logging.getLogger(__name__)
Expand All @@ -22,24 +24,18 @@ def _welcome_message():
boxify(
"DVC has enabled anonymous aggregate usage analytics.\n"
"Read the analytics documentation (and how to opt-out) here:\n"
"{blue}https://dvc.org/doc/user-guide/analytics{nc}".format(
blue=colorama.Fore.BLUE, nc=colorama.Fore.RESET
),
+ fmt_link("https://dvc.org/doc/user-guide/analytics"),
border_color="red",
)
)

msg = (
"{yellow}What's next?{nc}\n"
"{yellow}------------{nc}\n"
"- Check out the documentation: {blue}https://dvc.org/doc{nc}\n"
"- Get help and share ideas: {blue}https://dvc.org/chat{nc}\n"
"- Star us on GitHub: {blue}https://github.com/iterative/dvc{nc}"
).format(
yellow=colorama.Fore.YELLOW,
blue=colorama.Fore.BLUE,
nc=colorama.Fore.RESET,
)
f"- Check out the documentation: {fmt_link('https://dvc.org/doc')}\n"
f"- Get help and share ideas: {fmt_link('https://dvc.org/chat')}\n"
f"- Star us on GitHub: {fmt_link('https://github.com/iterative/dvc')}"
).format(yellow=colorama.Fore.YELLOW, nc=colorama.Fore.RESET)

logger.info(msg)

Expand Down

0 comments on commit 26963e4

Please sign in to comment.