diff options
| author | Dylan Araps <[email protected]> | 2018-02-05 08:44:06 +1100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2018-02-05 08:44:06 +1100 |
| commit | 59b42221c14e9e574c06beb1e8f0362f74092110 (patch) | |
| tree | f4fde675fd67043c2bdadfc649dbba3fa710aea0 | |
| parent | colors: Fix comment color in dark themes. Closes #178 (diff) | |
| parent | hotfix: chache -> cache (diff) | |
| download | pywal-59b42221c14e9e574c06beb1e8f0362f74092110.tar.xz pywal-59b42221c14e9e574c06beb1e8f0362f74092110.zip | |
Merge pull request #177 from deviantfero/master
Use separate versioning for cache files and pywal.
| -rw-r--r-- | pywal/__init__.py | 3 | ||||
| -rw-r--r-- | pywal/colors.py | 4 | ||||
| -rw-r--r-- | pywal/settings.py | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/pywal/__init__.py b/pywal/__init__.py index e9c0603..98d9a08 100644 --- a/pywal/__init__.py +++ b/pywal/__init__.py @@ -9,7 +9,7 @@ Created by Dylan Araps. """ -from .settings import __version__ +from .settings import __version__, __cache_version__ from . import colors from . import export from . import image @@ -19,6 +19,7 @@ from . import wallpaper __all__ = [ "__version__", + "__cache_version__", "colors", "export", "image", diff --git a/pywal/colors.py b/pywal/colors.py index 8688770..0fed29e 100644 --- a/pywal/colors.py +++ b/pywal/colors.py @@ -7,7 +7,7 @@ import shutil import subprocess import sys -from .settings import CACHE_DIR, COLOR_COUNT, __version__ +from .settings import CACHE_DIR, COLOR_COUNT, __cache_version__ from . import util @@ -107,7 +107,7 @@ def get(img, cache_dir=CACHE_DIR, color_type = "light" if light else "dark" cache_file = re.sub("[/|\\|.]", "_", img) cache_file = os.path.join(cache_dir, "schemes", "%s_%s_%s.json" - % (cache_file, color_type, __version__)) + % (cache_file, color_type, __cache_version__)) if os.path.isfile(cache_file): colors = file(cache_file) diff --git a/pywal/settings.py b/pywal/settings.py index c1b03fe..76a7598 100644 --- a/pywal/settings.py +++ b/pywal/settings.py @@ -13,7 +13,8 @@ import os import platform -__version__ = "1.3.0" +__version__ = "1.3.1" +__cache_version__ = "1.0.0" HOME = os.getenv("HOME", os.getenv("USERPROFILE")) |