Skip to content

Commit b1463cc

Browse files
committed
Merge branch 'release/1.2.0'
2 parents 4617ac0 + 64f4262 commit b1463cc

File tree

3 files changed

+219
-205
lines changed

3 files changed

+219
-205
lines changed

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace = false
99

1010
[project]
1111
name = "django_crypto_fields"
12-
version = "1.1.2"
12+
version = "1.2.0"
1313
description = "Add encrypted field classes and more to your Django models"
1414
readme = {file = "README.rst", content-type = "text/x-rst"}
1515
keywords = [

src/django_crypto_fields/key_path/key_path.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ def __post_init__(self):
5454
KEY_PATH_DOES_NOT_EXIST.format(invalid_path=str(path))
5555
)
5656
if (
57-
not settings.DEBUG
57+
not getattr(settings, "DJANGO_CRYPTO_FIELDS_KEY_PATH_IN_APP_FOLDER", False)
58+
and not settings.DEBUG
5859
and (
5960
get_test_module_from_settings()
6061
not in list(itertools.chain(*[x.split("/") for x in sys.argv]))

0 commit comments

Comments
 (0)