Merge b7ed057 into f0af058

joke2k · Nov 14, 2019 · 70c32a8 · 70c32a8
2 parents f0af058 + b7ed057
commit 70c32a8
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/environ/environ.py b/environ/environ.py
@@ -623,7 +623,8 @@ def read_env(cls, env_file=None, **overrides):
         """
         if env_file is None:
             frame = sys._getframe()
-            env_file = os.path.join(os.path.dirname(frame.f_back.f_code.co_filename), '.env')
+            env_file = os.environ.get('ENV_FILE')
+            env_file = env_file or os.path.join(os.path.dirname(frame.f_back.f_code.co_filename), '.env')
             if not os.path.exists(env_file):
                 warnings.warn(
                     "%s doesn't exist - if you're not configuring your "

diff --git a/environ/test.py b/environ/test.py
@@ -285,6 +285,16 @@ def setUp(self):
         file_path = Path(__file__, is_file=True)('test_env.txt')
         self.env.read_env(file_path, PATH_VAR=Path(__file__, is_file=True).__root__)
 
+
+class FileEnvByEnvVarTests(EnvTests):
+
+    def setUp(self):
+        super(FileEnvByEnvVarTests, self).setUp()
+        Env.ENVIRON = {}
+        os.environ['ENV_FILE'] = './environ/test_env.txt'
+        self.env = Env()
+        self.env.read_env()
+
 class SubClassTests(EnvTests):
 
     def setUp(self):
@@ -746,7 +756,7 @@ def load_suite():
 
     test_suite = unittest.TestSuite()
     cases = [
-        EnvTests, FileEnvTests, SubClassTests, SchemaEnvTests, PathTests,
+        EnvTests, FileEnvTests, FileEnvByEnvVarTests, SubClassTests, SchemaEnvTests, PathTests,
         DatabaseTestSuite, CacheTestSuite, EmailTests, SearchTestSuite
     ]
     for case in cases: