Vendoring dependencies Fix #301

dynaconf · May 22, 2020 · d53463f · d53463f
1 parent 343628f
commit d53463f
Show file tree

Hide file tree

Showing 85 changed files with 28,802 additions and 8 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -12,4 +12,5 @@ omit =
     dynaconf/loaders/vault_loader.py
     dynaconf/loaders/__init__.py
     dynaconf/example/*
+    dynaconf/vendor/*
     dynaconf/contrib/django_dynaconf/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,31 +6,40 @@ repos:
       - id: reorder-python-imports
         language_version: python3
         args: [--py3-plus]
+        exclude: ^dynaconf/vendor
   - repo: https://github.com/ambv/black
     rev: stable
     hooks:
       - id: black
         args: [--line-length=79]
         language_version: python3
+        exclude: ^dynaconf/vendor
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.0.0
     hooks:
       - id: trailing-whitespace
         language_version: python3
+        exclude: ^dynaconf/vendor
       - id: end-of-file-fixer
         language_version: python3
+        exclude: ^dynaconf/vendor
       - id: check-yaml
         language_version: python3
+        exclude: ^dynaconf/vendor
       - id: check-merge-conflict
         language_version: python3
+        exclude: ^dynaconf/vendor
       - id: debug-statements
         language_version: python3
+        exclude: ^dynaconf/vendor
       - id: fix-encoding-pragma
         language_version: python3
+        exclude: ^dynaconf/vendor
         args: [--remove]
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.7.0
     hooks:
       - id: flake8
         args: ['--ignore=F403,W504,W503,F841,E401,F401,E402']
         language_version: python3
+        exclude: ^dynaconf/vendor
diff --git a/Makefile b/Makefile
@@ -134,7 +134,6 @@ test: pep8 test_only
 
 install:
 	pip install --upgrade pip
-	python setup.py develop
 	pip install -r requirements_dev.txt
 	make setup-pre-commit
 
@@ -151,7 +150,7 @@ pep8:
 	#   F841 (local variable assigned but never used, useful for debugging on exception)
 	#   W504 (line break after binary operator, I prefer to put `and|or` at the end)
 	#   F403 (star import `from foo import *` often used in __init__ files)
-	flake8 dynaconf --ignore=F403,W504,W503,F841,E401,F401,E402
+	flake8 dynaconf --ignore=F403,W504,W503,F841,E401,F401,E402 --exclude=dynaconf/vendor
 
 dist: clean
 	@python setup.py sdist bdist_wheel

diff --git a/dynaconf/__init__.py b/dynaconf/__init__.py
@@ -1,13 +1,20 @@
-from dynaconf.base import LazySettings
-from dynaconf.contrib import DjangoDynaconf
-from dynaconf.contrib import FlaskDynaconf
-from dynaconf.validator import ValidationError
-from dynaconf.validator import Validator
+import os
+import sys
+
+sys.path.append(os.path.join(os.path.dirname(__file__), "vendor"))
+
+from dynaconf.base import LazySettings  # noqa
+from dynaconf.contrib import DjangoDynaconf  # noqav
+from dynaconf.contrib import FlaskDynaconf  # noqa
+from dynaconf.validator import ValidationError  # noqa
+from dynaconf.validator import Validator  # noqa
 
 settings = LazySettings()
+Dynaconf = LazySettings  # noqa
 
 __all__ = [
     "settings",
+    "Dynaconf",
     "LazySettings",
     "Validator",
     "FlaskDynaconf",

diff --git a/dynaconf/vendor/__init__.py b/dynaconf/vendor/__init__.py
diff --git a/dynaconf/vendor/box/README.md b/dynaconf/vendor/box/README.md
@@ -0,0 +1,6 @@
+## python-box
+
+Vendored dep taken from: https://github.com/cdgriffith/Box
+Licensed under MIT: https://github.com/cdgriffith/Box/blob/master/LICENSE
+
+Current version: 4.2.3
diff --git a/dynaconf/vendor/box/__init__.py b/dynaconf/vendor/box/__init__.py
@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+# -*- coding: UTF-8 -*-
+
+__author__ = 'Chris Griffith'
+__version__ = '4.2.3'
+
+from box.box import Box
+from box.box_list import BoxList
+from box.config_box import ConfigBox
+from box.shorthand_box import SBox
+from box.exceptions import BoxError, BoxKeyError
+from box.from_file import box_from_file