From 8815885ee1b8ce9a33c3054df5bd7032bf297d33 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 15 Nov 2020 15:26:26 +0100
Subject: [PATCH 01/22] Fix pypy environment in Travis CI

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 8f51de38..8ccd2405 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,6 +33,7 @@ script:
   - tox
 
 before_install:
+  - pip install --upgrade pip
   - pip install coveralls
 
 after_success:

From 17dba65244c1d4d10f591fe37c924bd2c6fd1cfc Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 15 Nov 2020 13:06:25 +0100
Subject: [PATCH 02/22] Decouple variable parsing and expansion

This is now done in two steps:

- Parse the value into a sequence of atoms (literal of variable).
- Resolve that sequence into a string.
---
 src/dotenv/main.py      |  59 ++++++++--------------
 src/dotenv/variables.py | 106 ++++++++++++++++++++++++++++++++++++++++
 tests/test_variables.py |  35 +++++++++++++
 3 files changed, 162 insertions(+), 38 deletions(-)
 create mode 100644 src/dotenv/variables.py
 create mode 100644 tests/test_variables.py

diff --git a/src/dotenv/main.py b/src/dotenv/main.py
index 58a23f3d..ea523d48 100644
--- a/src/dotenv/main.py
+++ b/src/dotenv/main.py
@@ -4,7 +4,6 @@
 import io
 import logging
 import os
-import re
 import shutil
 import sys
 import tempfile
@@ -13,13 +12,13 @@
 
 from .compat import IS_TYPE_CHECKING, PY2, StringIO, to_env
 from .parser import Binding, parse_stream
+from .variables import parse_variables
 
 logger = logging.getLogger(__name__)
 
 if IS_TYPE_CHECKING:
-    from typing import (
-        Dict, Iterable, Iterator, Match, Optional, Pattern, Union, Text, IO, Tuple
-    )
+    from typing import (IO, Dict, Iterable, Iterator, Mapping, Optional, Text,
+                        Tuple, Union)
     if sys.version_info >= (3, 6):
         _PathLike = os.PathLike
     else:
@@ -30,18 +29,6 @@
     else:
         _StringIO = StringIO[Text]
 
-__posix_variable = re.compile(
-    r"""
-    \$\{
-        (?P<name>[^\}:]*)
-        (?::-
-            (?P<default>[^\}]*)
-        )?
-    \}
-    """,
-    re.VERBOSE,
-)  # type: Pattern[Text]
-
 
 def with_warn_for_invalid_lines(mappings):
     # type: (Iterator[Binding]) -> Iterator[Binding]
@@ -83,13 +70,14 @@ def dict(self):
         if self._dict:
             return self._dict
 
+        raw_values = self.parse()
+
         if self.interpolate:
-            values = resolve_nested_variables(self.parse())
+            self._dict = OrderedDict(resolve_variables(raw_values))
         else:
-            values = OrderedDict(self.parse())
+            self._dict = OrderedDict(raw_values)
 
-        self._dict = values
-        return values
+        return self._dict
 
     def parse(self):
         # type: () -> Iterator[Tuple[Text, Optional[Text]]]
@@ -217,27 +205,22 @@ def unset_key(dotenv_path, key_to_unset, quote_mode="always"):
     return removed, key_to_unset
 
 
-def resolve_nested_variables(values):
-    # type: (Iterable[Tuple[Text, Optional[Text]]]) -> Dict[Text, Optional[Text]]
-    def _replacement(name, default):
-        # type: (Text, Optional[Text]) -> Text
-        default = default if default is not None else ""
-        ret = new_values.get(name, os.getenv(name, default))
-        return ret  # type: ignore
+def resolve_variables(values):
+    # type: (Iterable[Tuple[Text, Optional[Text]]]) -> Mapping[Text, Optional[Text]]
 
-    def _re_sub_callback(match):
-        # type: (Match[Text]) -> Text
-        """
-        From a match object gets the variable name and returns
-        the correct replacement
-        """
-        matches = match.groupdict()
-        return _replacement(name=matches["name"], default=matches["default"])  # type: ignore
+    new_values = {}  # type: Dict[Text, Optional[Text]]
 
-    new_values = {}
+    for (name, value) in values:
+        if value is None:
+            result = None
+        else:
+            atoms = parse_variables(value)
+            env = {}  # type: Dict[Text, Optional[Text]]
+            env.update(os.environ)  # type: ignore
+            env.update(new_values)
+            result = "".join(atom.resolve(env) for atom in atoms)
 
-    for (k, v) in values:
-        new_values[k] = __posix_variable.sub(_re_sub_callback, v) if v is not None else None
+        new_values[name] = result
 
     return new_values
 
diff --git a/src/dotenv/variables.py b/src/dotenv/variables.py
new file mode 100644
index 00000000..4828dfc2
--- /dev/null
+++ b/src/dotenv/variables.py
@@ -0,0 +1,106 @@
+import re
+from abc import ABCMeta
+
+from .compat import IS_TYPE_CHECKING
+
+if IS_TYPE_CHECKING:
+    from typing import Iterator, Mapping, Optional, Pattern, Text
+
+
+_posix_variable = re.compile(
+    r"""
+    \$\{
+        (?P<name>[^\}:]*)
+        (?::-
+            (?P<default>[^\}]*)
+        )?
+    \}
+    """,
+    re.VERBOSE,
+)  # type: Pattern[Text]
+
+
+class Atom():
+    __metaclass__ = ABCMeta
+
+    def __ne__(self, other):
+        # type: (object) -> bool
+        result = self.__eq__(other)
+        if result is NotImplemented:
+            return NotImplemented
+        return not result
+
+    def resolve(self, env):
+        # type: (Mapping[Text, Optional[Text]]) -> Text
+        raise NotImplementedError
+
+
+class Literal(Atom):
+    def __init__(self, value):
+        # type: (Text) -> None
+        self.value = value
+
+    def __repr__(self):
+        # type: () -> str
+        return "Literal(value={})".format(self.value)
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return self.value == other.value
+
+    def __hash__(self):
+        # type: () -> int
+        return hash((self.__class__, self.value))
+
+    def resolve(self, env):
+        # type: (Mapping[Text, Optional[Text]]) -> Text
+        return self.value
+
+
+class Variable(Atom):
+    def __init__(self, name, default):
+        # type: (Text, Optional[Text]) -> None
+        self.name = name
+        self.default = default
+
+    def __repr__(self):
+        # type: () -> str
+        return "Variable(name={}, default={})".format(self.name, self.default)
+
+    def __eq__(self, other):
+        # type: (object) -> bool
+        if not isinstance(other, self.__class__):
+            return NotImplemented
+        return (self.name, self.default) == (other.name, other.default)
+
+    def __hash__(self):
+        # type: () -> int
+        return hash((self.__class__, self.name, self.default))
+
+    def resolve(self, env):
+        # type: (Mapping[Text, Optional[Text]]) -> Text
+        default = self.default if self.default is not None else ""
+        result = env.get(self.name, default)
+        return result if result is not None else ""
+
+
+def parse_variables(value):
+    # type: (Text) -> Iterator[Atom]
+    cursor = 0
+
+    for match in _posix_variable.finditer(value):
+        (start, end) = match.span()
+        name = match.groupdict()["name"]
+        default = match.groupdict()["default"]
+
+        if start > cursor:
+            yield Literal(value=value[cursor:start])
+
+        yield Variable(name=name, default=default)
+        cursor = end
+
+    length = len(value)
+    if cursor < length:
+        yield Literal(value=value[cursor:length])
diff --git a/tests/test_variables.py b/tests/test_variables.py
new file mode 100644
index 00000000..86b06466
--- /dev/null
+++ b/tests/test_variables.py
@@ -0,0 +1,35 @@
+import pytest
+
+from dotenv.variables import Literal, Variable, parse_variables
+
+
+@pytest.mark.parametrize(
+    "value,expected",
+    [
+        ("", []),
+        ("a", [Literal(value="a")]),
+        ("${a}", [Variable(name="a", default=None)]),
+        ("${a:-b}", [Variable(name="a", default="b")]),
+        (
+            "${a}${b}",
+            [
+                Variable(name="a", default=None),
+                Variable(name="b", default=None),
+            ],
+        ),
+        (
+            "a${b}c${d}e",
+            [
+                Literal(value="a"),
+                Variable(name="b", default=None),
+                Literal(value="c"),
+                Variable(name="d", default=None),
+                Literal(value="e"),
+            ],
+        ),
+    ]
+)
+def test_parse_variables(value, expected):
+    result = parse_variables(value)
+
+    assert list(result) == expected

From 26ff5b74c676dbed391eb535ad2a591ecf98d3c6 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 15 Nov 2020 12:25:27 +0100
Subject: [PATCH 03/22] Fix variable expansion order without override

This fixes an issue when a variable is resolved differently in two
bindings.

For instance, take the following env file:

```
PORT=8000
URL=http://localhost:${PORT}
```

With `PORT` set to `1234` in the environment, the environment resulting
from `dotenv_load(override=False)` would be:

```
PORT=1234
URL=http://localhost:8000
```

This was inconsistent and is fixed by this commit.  The environment
would now be:

```
PORT=1234
URL=http://localhost:1234
```

with override, and

```
PORT=8000
URL=http://localhost:8000
```

without override.

The behavior of `load_dotenv` is unchanged and always assumes
`override=True`.
---
 CHANGELOG.md       |  2 +-
 README.md          | 11 ++++++++++-
 src/dotenv/main.py | 30 ++++++++++++++++++------------
 tests/test_main.py | 22 ++++++++++++++++++++++
 4 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56a7a94c..effa2510 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-_There are no unreleased changes at this time._
+- Fix resolution order in variable expansion with `override=False` (#? by [@bbc2]).
 
 ## [0.15.0] - 2020-10-28
 
diff --git a/README.md b/README.md
index 5c9aeaf9..36f3b2b0 100644
--- a/README.md
+++ b/README.md
@@ -41,13 +41,22 @@ export SECRET_KEY=YOURSECRETKEYGOESHERE
 
 Python-dotenv can interpolate variables using POSIX variable expansion.
 
-The value of a variable is the first of the values defined in the following list:
+With `load_dotenv(override=True)` or `dotenv_values()`, the value of a variable is the
+first of the values defined in the following list:
 
 - Value of that variable in the `.env` file.
 - Value of that variable in the environment.
 - Default value, if provided.
 - Empty string.
 
+With `load_dotenv(override=False)`, the value of a variable is the first of the values
+defined in the following list:
+
+- Value of that variable in the environment.
+- Value of that variable in the `.env` file.
+- Default value, if provided.
+- Empty string.
+
 Ensure that variables are surrounded with `{}` like `${HOME}` as bare
 variables such as `$HOME` are not expanded.
 
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
index ea523d48..b366b18e 100644
--- a/src/dotenv/main.py
+++ b/src/dotenv/main.py
@@ -43,13 +43,14 @@ def with_warn_for_invalid_lines(mappings):
 
 class DotEnv():
 
-    def __init__(self, dotenv_path, verbose=False, encoding=None, interpolate=True):
-        # type: (Union[Text, _PathLike, _StringIO], bool, Union[None, Text], bool) -> None
+    def __init__(self, dotenv_path, verbose=False, encoding=None, interpolate=True, override=True):
+        # type: (Union[Text, _PathLike, _StringIO], bool, Union[None, Text], bool, bool) -> None
         self.dotenv_path = dotenv_path  # type: Union[Text,_PathLike, _StringIO]
         self._dict = None  # type: Optional[Dict[Text, Optional[Text]]]
         self.verbose = verbose  # type: bool
         self.encoding = encoding  # type: Union[None, Text]
         self.interpolate = interpolate  # type: bool
+        self.override = override  # type: bool
 
     @contextmanager
     def _get_stream(self):
@@ -73,7 +74,7 @@ def dict(self):
         raw_values = self.parse()
 
         if self.interpolate:
-            self._dict = OrderedDict(resolve_variables(raw_values))
+            self._dict = OrderedDict(resolve_variables(raw_values, override=self.override))
         else:
             self._dict = OrderedDict(raw_values)
 
@@ -86,13 +87,13 @@ def parse(self):
                 if mapping.key is not None:
                     yield mapping.key, mapping.value
 
-    def set_as_environment_variables(self, override=False):
-        # type: (bool) -> bool
+    def set_as_environment_variables(self):
+        # type: () -> bool
         """
         Load the current dotenv as system environemt variable.
         """
         for k, v in self.dict().items():
-            if k in os.environ and not override:
+            if k in os.environ and not self.override:
                 continue
             if v is not None:
                 os.environ[to_env(k)] = to_env(v)
@@ -205,8 +206,8 @@ def unset_key(dotenv_path, key_to_unset, quote_mode="always"):
     return removed, key_to_unset
 
 
-def resolve_variables(values):
-    # type: (Iterable[Tuple[Text, Optional[Text]]]) -> Mapping[Text, Optional[Text]]
+def resolve_variables(values, override):
+    # type: (Iterable[Tuple[Text, Optional[Text]]], bool) -> Mapping[Text, Optional[Text]]
 
     new_values = {}  # type: Dict[Text, Optional[Text]]
 
@@ -216,8 +217,12 @@ def resolve_variables(values):
         else:
             atoms = parse_variables(value)
             env = {}  # type: Dict[Text, Optional[Text]]
-            env.update(os.environ)  # type: ignore
-            env.update(new_values)
+            if override:
+                env.update(os.environ)  # type: ignore
+                env.update(new_values)
+            else:
+                env.update(new_values)
+                env.update(os.environ)  # type: ignore
             result = "".join(atom.resolve(env) for atom in atoms)
 
         new_values[name] = result
@@ -299,10 +304,11 @@ def load_dotenv(dotenv_path=None, stream=None, verbose=False, override=False, in
                   Defaults to `False`.
     """
     f = dotenv_path or stream or find_dotenv()
-    return DotEnv(f, verbose=verbose, interpolate=interpolate, **kwargs).set_as_environment_variables(override=override)
+    dotenv = DotEnv(f, verbose=verbose, interpolate=interpolate, override=override, **kwargs)
+    return dotenv.set_as_environment_variables()
 
 
 def dotenv_values(dotenv_path=None, stream=None, verbose=False, interpolate=True, **kwargs):
     # type: (Union[Text, _PathLike, None], Optional[_StringIO], bool, bool, Union[None, Text]) -> Dict[Text, Optional[Text]]  # noqa: E501
     f = dotenv_path or stream or find_dotenv()
-    return DotEnv(f, verbose=verbose, interpolate=interpolate, **kwargs).dict()
+    return DotEnv(f, verbose=verbose, interpolate=interpolate, override=True, **kwargs).dict()
diff --git a/tests/test_main.py b/tests/test_main.py
index 6b9458d2..b927d7f2 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -257,6 +257,28 @@ def test_load_dotenv_existing_variable_override(dotenv_file):
     assert os.environ == {"a": "b"}
 
 
+@mock.patch.dict(os.environ, {"a": "c"}, clear=True)
+def test_load_dotenv_redefine_var_used_in_file_no_override(dotenv_file):
+    with open(dotenv_file, "w") as f:
+        f.write('a=b\nd="${a}"')
+
+    result = dotenv.load_dotenv(dotenv_file)
+
+    assert result is True
+    assert os.environ == {"a": "c", "d": "c"}
+
+
+@mock.patch.dict(os.environ, {"a": "c"}, clear=True)
+def test_load_dotenv_redefine_var_used_in_file_with_override(dotenv_file):
+    with open(dotenv_file, "w") as f:
+        f.write('a=b\nd="${a}"')
+
+    result = dotenv.load_dotenv(dotenv_file, override=True)
+
+    assert result is True
+    assert os.environ == {"a": "b", "d": "b"}
+
+
 @mock.patch.dict(os.environ, {}, clear=True)
 def test_load_dotenv_utf_8():
     stream = StringIO("a=à")

From 2e0ea4873ba39192db97fcafdb16ae03ffcaf951 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 27 Dec 2020 20:28:16 +0100
Subject: [PATCH 04/22] Rewrite readme (#294)

This mainly reorganizes the readme based on questions and feedback from
users on GitHub over the years:

- Getting Started: Short section which covers the main use case and
  doesn't go into details.
  - Pip command at the very beginning so that users are less likely to
    mistakenly install another package.
  - Basic application code to load the .env file into the environment.
  - Introduction to the syntax of .env files with a short example.
- Other common use cases:
  - Load configuration without altering the environment
  - Parse configuration as a stream
  - Load .env files in IPython
- Command-line Interface
- File format: Details about the syntax of .env files, previously
  scattered around.
- Related Projects: I'm not sure we really need that one but I guess we can keep
  it for now.
- Acknowledgements

Minor changes:

- I removed the "saythanks" link since it is dead.
- I removed the banner made in ASCII art since it read ".env" and not
  "python-dotenv", which I found distracting.  We could make another one
  but I don't have time right now.  It also saves the user some
  scrolling.
---
 README.md | 339 +++++++++++++++++++++---------------------------------
 1 file changed, 132 insertions(+), 207 deletions(-)

diff --git a/README.md b/README.md
index 36f3b2b0..03638adc 100644
--- a/README.md
+++ b/README.md
@@ -1,276 +1,193 @@
-```
-        _______ .__   __. ____    ____
-       |   ____||  \ |  | \   \  /   /
-       |  |__   |   \|  |  \   \/   /
-       |   __|  |  . `  |   \      /
-    __ |  |____ |  |\   |    \    /
-   (__)|_______||__| \__|     \__/
-```
-python-dotenv | [![Build Status](https://travis-ci.com/theskumar/python-dotenv.svg?branch=master)](https://travis-ci.com/theskumar/python-dotenv) [![Coverage Status](https://coveralls.io/repos/theskumar/python-dotenv/badge.svg?branch=master)](https://coveralls.io/r/theskumar/python-dotenv?branch=master) [![PyPI version](https://badge.fury.io/py/python-dotenv.svg)](http://badge.fury.io/py/python-dotenv) [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/theskumar)
-===============================================================================
-
-Reads the key-value pair from `.env` file and adds them to environment
-variable. It is great for managing app settings during development and
-in production using [12-factor](http://12factor.net/) principles.
+# python-dotenv
 
-> Do one thing, do it well!
+[![Build Status][build_status_badge]][build_status_link]
+[![Coverage Status][coverage_status_badge]][coverage_status_link]
+[![PyPI version][pypi_badge]][pypi_link]
 
-## Usages
+Python-dotenv reads key-value pairs from a `.env` file and can set them as environment
+variables. It helps in the development of applications following the
+[12-factor](http://12factor.net/) principles.
 
-The easiest and most common usage consists on calling `load_dotenv` when
-the application starts, which will load environment variables from a
-file named `.env` in the current directory or any of its parents or from
-the path specificied; after that, you can just call the
-environment-related method you need as provided by `os.getenv`.
-
-`.env` looks like this:
+## Getting Started
 
 ```shell
-# a comment that will be ignored.
-REDIS_ADDRESS=localhost:6379
-MEANING_OF_LIFE=42
-MULTILINE_VAR="hello\nworld"
+pip install python-dotenv
 ```
 
-You can optionally prefix each line with the word `export`, which is totally ignored by this library, but might allow you to [`source`](https://bash.cyberciti.biz/guide/Source_command) the file in bash.
+If your application takes its configuration from environment variables, like a 12-factor
+application, launching it in development is not very practical because you have to set
+those environment variables yourself.
 
-```
-export S3_BUCKET=YOURS3BUCKET
-export SECRET_KEY=YOURSECRETKEYGOESHERE
-```
+To help you with that, you can add Python-dotenv to your application to make it load the
+configuration from a `.env` file when it is present (e.g. in development) while remaining
+configurable via the environment:
 
-Python-dotenv can interpolate variables using POSIX variable expansion.
+```python
+from dotenv import load_dotenv
 
-With `load_dotenv(override=True)` or `dotenv_values()`, the value of a variable is the
-first of the values defined in the following list:
+load_dotenv()  # take environment variables from .env.
 
-- Value of that variable in the `.env` file.
-- Value of that variable in the environment.
-- Default value, if provided.
-- Empty string.
+# Code of your application, which uses environment variables (e.g. from `os.environ` or
+# `os.getenv`) as if they came from the actual environment.
+```
 
-With `load_dotenv(override=False)`, the value of a variable is the first of the values
-defined in the following list:
+By default, `load_dotenv` doesn't override existing environment variables.
 
-- Value of that variable in the environment.
-- Value of that variable in the `.env` file.
-- Default value, if provided.
-- Empty string.
+To configure the development environment, add a `.env` in the root directory of your
+project:
 
-Ensure that variables are surrounded with `{}` like `${HOME}` as bare
-variables such as `$HOME` are not expanded.
+```
+.
+├── .env
+└── foo.py
+```
 
-```shell
-CONFIG_PATH=${HOME}/.config/foo
+The syntax of `.env` files supported by python-dotenv is similar to that of Bash:
+
+```bash
+# Development settings
 DOMAIN=example.org
-EMAIL=admin@${DOMAIN}
-DEBUG=${DEBUG:-false}
+ADMIN_EMAIL=admin@${DOMAIN}
+ROOT_URL=${DOMAIN}/app
 ```
 
-## Getting started
+If you use variables in values, ensure they are surrounded with `{` and `}`, like
+`${DOMAIN}`, as bare variables such as `$DOMAIN` are not expanded.
 
-Install the latest version with:
+You will probably want to add `.env` to your `.gitignore`, especially if it contains
+secrets like a password.
 
-```shell
-pip install -U python-dotenv
-```
+See the section "File format" below for more information about what you can write in a
+`.env` file.
 
-Assuming you have created the `.env` file along-side your settings
-module.
+## Other Use Cases
 
-    .
-    ├── .env
-    └── settings.py
+### Load configuration without altering the environment
 
-Add the following code to your `settings.py`:
+The function `dotenv_values` works more or less the same way as `load_dotenv`, except it
+doesn't touch the environment, it just returns a `dict` with the values parsed from the
+`.env` file.
 
 ```python
-# settings.py
-from dotenv import load_dotenv
-load_dotenv()
-
-# OR, the same with increased verbosity
-load_dotenv(verbose=True)
+from dotenv import dotenv_values
 
-# OR, explicitly providing path to '.env'
-from pathlib import Path  # Python 3.6+ only
-env_path = Path('.') / '.env'
-load_dotenv(dotenv_path=env_path)
+config = dotenv_values(".env")  # config = {"USER": "foo", "EMAIL": "foo@example.org"}
 ```
 
-At this point, parsed key/value from the `.env` file is now present as
-system environment variable and they can be conveniently accessed via
-`os.getenv()`:
+This notably enables advanced configuration management:
 
 ```python
-# settings.py
 import os
-SECRET_KEY = os.getenv("EMAIL")
-DATABASE_PASSWORD = os.getenv("DATABASE_PASSWORD")
-```
-
-`load_dotenv` does not override existing System environment variables. To
-override, pass `override=True` to `load_dotenv()`.
-
-`load_dotenv` also accepts `encoding` parameter to open the `.env` file. The default encoding is platform dependent (whatever `locale.getpreferredencoding()` returns), but any encoding supported by Python can be used. See the [codecs](https://docs.python.org/3/library/codecs.html#standard-encodings) module for the list of supported encodings.
+from dotenv import dotenv_values
 
-You can use `find_dotenv()` method that will try to find a `.env` file
-by (a) guessing where to start using `__file__` or the working directory
--- allowing this to work in non-file contexts such as IPython notebooks
-and the REPL, and then (b) walking up the directory tree looking for the
-specified file -- called `.env` by default.
-
-```python
-from dotenv import load_dotenv, find_dotenv
-load_dotenv(find_dotenv())
+config = {
+    **dotenv_values(".env.shared"),  # load shared development variables
+    **dotenv_values(".env.secret"),  # load sensitive variables
+    **os.environ,  # override loaded values with environment variables
+}
 ```
 
-### In-memory filelikes
+### Parse configuration as a stream
 
-It is possible to not rely on the filesystem to parse filelikes from
-other sources (e.g. from a network storage). `load_dotenv` and
-`dotenv_values` accepts a filelike `stream`. Just be sure to rewind it
-before passing.
+`load_dotenv` and `dotenv_values` accept [streams][python_streams] via their `stream`
+argument.  It is thus possible to load the variables from sources other than the
+filesystem (e.g. the network).
 
 ```python
->>> from io import StringIO     # Python2: from StringIO import StringIO
->>> from dotenv import dotenv_values
->>> filelike = StringIO('SPAM=EGGS\n')
->>> filelike.seek(0)
->>> parsed = dotenv_values(stream=filelike)
->>> parsed['SPAM']
-'EGGS'
-```
-
-The returned value is dictionary with key-value pairs.
-
-`dotenv_values` could be useful if you need to *consume* the envfile but
-not *apply* it directly into the system environment.
-
-### Django
-
-If you are using Django, you should add the above loader script at the
-top of `wsgi.py` and `manage.py`.
+from io import StringIO
 
+from dotenv import load_dotenv
 
-## IPython Support
+config = StringIO("USER=foo\nEMAIL=foo@example.org")
+load_dotenv(stream=stream)
+```
 
-You can use dotenv with IPython. You can either let the dotenv search
-for `.env` with `%dotenv` or provide the path to the `.env` file explicitly; see
-below for usages.
+### Load .env files in IPython
 
-    %load_ext dotenv
+You can use dotenv in IPython.  By default, it will use `find_dotenv` to search for a
+`.env` file:
 
-    # Use find_dotenv to locate the file
-    %dotenv
+```python
+%load_ext dotenv
+%dotenv
+```
 
-    # Specify a particular file
-    %dotenv relative/or/absolute/path/to/.env
+You can also specify a path:
 
-    # Use '-o' to indicate override of existing variables
-    %dotenv -o
+```python
+%dotenv relative/or/absolute/path/to/.env
+```
 
-    # Use '-v' to turn verbose mode on
-    %dotenv -v
+Optional flags:
 
+- `-o` to override existing variables.
+- `-v` for increased verbosity.
 
 ## Command-line Interface
 
-For command-line support, use the CLI option during installation:
+A CLI interface `dotenv` is also included, which helps you manipulate the `.env` file
+without manually opening it.
 
 ```shell
-pip install -U "python-dotenv[cli]"
+$ pip install "python-dotenv[cli]"
+$ dotenv set USER=foo
+$ dotenv set EMAIL=foo@example.org
+$ dotenv list
+USER=foo
+EMAIL=foo@example.org
+$ dotenv run -- python foo.py
 ```
 
-A CLI interface `dotenv` is also included, which helps you manipulate
-the `.env` file without manually opening it. The same CLI installed on
-remote machine combined with fabric (discussed later) will enable you to
-update your settings on a remote server; handy, isn't it!
+Run `dotenv --help` for more information about the options and subcommands.
 
-```
-Usage: dotenv [OPTIONS] COMMAND [ARGS]...
-
-  This script is used to set, get or unset values from a .env file.
-
-Options:
-  -f, --file PATH                 Location of the .env file, defaults to .env
-                                  file in current working directory.
+## File format
 
-  -q, --quote [always|never|auto]
-                                  Whether to quote or not the variable values.
-                                  Default mode is always. This does not affect
-                                  parsing.
+The format is not formally specified and still improves over time.  That being said,
+`.env` files should mostly look like Bash files.
 
-  -e, --export BOOLEAN
-                                  Whether to write the dot file as an
-                                  executable bash script.
+Keys can be unquoted or single-quoted. Values can be unquoted, single- or double-quoted.
+Spaces before and after keys, equal signs, and values are ignored. Values can be followed
+by a comment.  Lines can start with the `export` directive, which has no effect on their
+interpretation.
 
-  --version                       Show the version and exit.
-  --help                          Show this message and exit.
-
-Commands:
-  get    Retrieve the value for the given key.
-  list   Display all the stored key/value.
-  run    Run command with environment variables present.
-  set    Store the given key/value.
-  unset  Removes the given key.
-```
+Allowed escape sequences:
 
+- in single-quoted values: `\\`, `\'`
+- in double-quoted values: `\\`, `\'`, `\"`, `\a`, `\b`, `\f`, `\n`, `\r`, `\t`, `\v`
 
-### Setting config on Remote Servers
+### Multiline values
 
-We make use of excellent [Fabric](http://www.fabfile.org/) to accomplish
-this. Add a config task to your local fabfile; `dotenv_path` is the
-location of the absolute path of `.env` file on the remote server.
+It is possible for single- or double-quoted values to span multiple lines.  The following
+examples are equivalent:
 
-```python
-# fabfile.py
-
-import dotenv
-from fabric.api import task, run, env
-
-# absolute path to the location of .env on remote server.
-env.dotenv_path = '/opt/myapp/.env'
-
-@task
-def config(action=None, key=None, value=None):
-    '''Manage project configuration via .env
-
-    e.g: fab config:set,<key>,<value>
-         fab config:get,<key>
-         fab config:unset,<key>
-         fab config:list
-    '''
-    run('touch %(dotenv_path)s' % env)
-    command = dotenv.get_cli_string(env.dotenv_path, action, key, value)
-    run(command)
+```bash
+FOO="first line
+second line"
 ```
 
-Usage is designed to mirror the Heroku config API very closely.
-
-Get all your remote config info with `fab config`:
-
-    $ fab config
-    foo="bar"
-
-Set remote config variables with `fab config:set,<key>,<value>`:
-
-    $ fab config:set,hello,world
-
-Get a single remote config variables with `fab config:get,<key>`:
+```bash
+FOO="first line\nsecond line"
+```
 
-    $ fab config:get,hello
+### Variable expansion
 
-Delete a remote config variables with `fab config:unset,<key>`:
+Python-dotenv can interpolate variables using POSIX variable expansion.
 
-    $ fab config:unset,hello
+With `load_dotenv(override=True)` or `dotenv_values()`, the value of a variable is the
+first of the values defined in the following list:
 
-Thanks entirely to fabric and not one bit to this project, you can chain
-commands like so:
-`fab config:set,<key1>,<value1> config:set,<key2>,<value2>`
+- Value of that variable in the `.env` file.
+- Value of that variable in the environment.
+- Default value, if provided.
+- Empty string.
 
-    $ fab config:set,hello,world config:set,foo,bar config:set,fizz=buzz
+With `load_dotenv(override=False)`, the value of a variable is the first of the values
+defined in the following list:
 
+- Value of that variable in the environment.
+- Value of that variable in the `.env` file.
+- Default value, if provided.
+- Empty string.
 
 ## Related Projects
 
@@ -283,9 +200,17 @@ commands like so:
 -   [environs](https://github.com/sloria/environs)
 -   [dynaconf](https://github.com/rochacbruno/dynaconf)
 
-
 ## Acknowledgements
 
-This project is currently maintained by [Saurabh Kumar](https://saurabh-kumar.com) and [Bertrand Bonnefoy-Claudet](https://github.com/bbc2) and would not
-have been possible without the support of these [awesome
+This project is currently maintained by [Saurabh Kumar](https://saurabh-kumar.com) and
+[Bertrand Bonnefoy-Claudet](https://github.com/bbc2) and would not have been possible
+without the support of these [awesome
 people](https://github.com/theskumar/python-dotenv/graphs/contributors).
+
+[build_status_badge]: https://travis-ci.com/theskumar/python-dotenv.svg?branch=master
+[build_status_link]: https://travis-ci.com/theskumar/python-dotenv
+[coverage_status_badge]: https://coveralls.io/repos/theskumar/python-dotenv/badge.svg?branch=master
+[coverage_status_link]: https://coveralls.io/r/theskumar/python-dotenv?branch=master
+[pypi_badge]: https://badge.fury.io/py/python-dotenv.svg
+[pypi_link]: http://badge.fury.io/py/python-dotenv
+[python_streams]: https://docs.python.org/3/library/io.html

From 192722508a62fc4e25293a9e6061744773a3fdf7 Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Mon, 28 Dec 2020 01:20:57 +0530
Subject: [PATCH 05/22] doc: add table of content

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 03638adc..127d46f0 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,18 @@ Python-dotenv reads key-value pairs from a `.env` file and can set them as envir
 variables. It helps in the development of applications following the
 [12-factor](http://12factor.net/) principles.
 
+- [Getting Started](#getting-started)
+- [Other Use Cases](#other-use-cases)
+  * [Load configuration without altering the environment](#load-configuration-without-altering-the-environment)
+  * [Parse configuration as a stream](#parse-configuration-as-a-stream)
+  * [Load .env files in IPython](#load-env-files-in-ipython)
+- [Command-line Interface](#command-line-interface)
+- [File format](#file-format)
+  * [Multiline values](#multiline-values)
+  * [Variable expansion](#variable-expansion)
+- [Related Projects](#related-projects)
+- [Acknowledgements](#acknowledgements)
+
 ## Getting Started
 
 ```shell

From ac670cf993fd622bfc0a5ea961681341b291779e Mon Sep 17 00:00:00 2001
From: Serghei Iakovlev <sergeyklay@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:36:45 +0200
Subject: [PATCH 06/22] Fix misspelling

---
 src/dotenv/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dotenv/main.py b/src/dotenv/main.py
index b366b18e..31c41ee7 100644
--- a/src/dotenv/main.py
+++ b/src/dotenv/main.py
@@ -90,7 +90,7 @@ def parse(self):
     def set_as_environment_variables(self):
         # type: () -> bool
         """
-        Load the current dotenv as system environemt variable.
+        Load the current dotenv as system environment variable.
         """
         for k, v in self.dict().items():
             if k in os.environ and not self.override:

From a7fe93f6cc73ab9de28191e3854f1a713d53363b Mon Sep 17 00:00:00 2001
From: Saurabh Kumar <theskumar@users.noreply.github.com>
Date: Sun, 18 Oct 2020 17:29:07 +0530
Subject: [PATCH 07/22] Add GitHub actions to replace Travis CI

---
 .github/workflows/release.yml | 25 +++++++++++++++++
 .github/workflows/test.yml    | 25 +++++++++++++++++
 .travis.yml                   | 52 -----------------------------------
 setup.cfg                     |  4 ++-
 tox.ini                       | 19 ++++++++-----
 5 files changed, 65 insertions(+), 60 deletions(-)
 create mode 100644 .github/workflows/release.yml
 create mode 100644 .github/workflows/test.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..a3abd994
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,25 @@
+name: Upload Python Package
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: '3.x'
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install setuptools wheel twine
+    - name: Build and publish
+      env:
+        TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+      run: |
+        make release
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 00000000..04805932
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,25 @@
+name: Run Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      max-parallel: 8
+      matrix:
+        os:
+          - ubuntu-latest
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, pypy2, pypy3]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install tox tox-gh-actions
+    - name: Test with tox
+      run: tox
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 8ccd2405..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-language: python
-cache: pip
-os: linux
-dist: xenial
-
-jobs:
-  include:
-    - python: "3.6"
-      env: TOXENV=lint
-    - python: "3.6"
-      env: TOXENV=manifest
-    - python: "2.7"
-      env: TOXENV=py27
-    - python: "3.5"
-      env: TOXENV=py35
-    - python: "3.6"
-      env: TOXENV=py36
-    - python: "3.7"
-      env: TOXENV=py37
-    - python: "3.8"
-      env: TOXENV=py38
-    - python: "3.9-dev"
-      env: TOXENV=py39
-    - python: "pypy"
-      env: TOXENV=pypy
-    - python: "pypy3"
-      env: TOXENV=pypy3
-
-install:
-  - pip install tox
-
-script:
-  - tox
-
-before_install:
-  - pip install --upgrade pip
-  - pip install coveralls
-
-after_success:
-  - tox -e coverage-report
-  - coveralls
-
-deploy:
-  provider: pypi
-  username: theskumar
-  password:
-    secure: DXUkl4YSC2RCltChik1csvQulnVMQQpD/4i4u+6pEyUfBMYP65zFYSNwLh+jt+URyX+MpN/Er20+TZ/F/fu7xkru6/KBqKLugeXihNbwGhbHUIkjZT/0dNSo03uAz6s5fWgqr8EJk9Ll71GexAsBPx2yqsjc2BMgOjwcNly40Co=
-  distributions: "sdist bdist_wheel"
-  skip_existing: true
-  on:
-    tags: true
-    repo: theskumar/python-dotenv
diff --git a/setup.cfg b/setup.cfg
index 9d69a202..e882b8db 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,12 +17,13 @@ exclude = .tox,.git,docs,venv,.venv
 ignore_missing_imports = true
 
 [metadata]
-description-file = README.rst
+description-file = README.md
 
 [tool:pytest]
 testpaths = tests
 
 [coverage:run]
+relative_files = True
 source = dotenv
 
 [coverage:paths]
@@ -33,6 +34,7 @@ source =
 
 [coverage:report]
 show_missing = True
+include = */site-packages/dotenv/*
 exclude_lines =
     if IS_TYPE_CHECKING:
     pragma: no cover
diff --git a/tox.ini b/tox.ini
index 0025c946..e4d6f638 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,16 @@
 [tox]
-envlist = lint,py{27,34,35,36,37,38,39,34-no-typing},pypy,pypy3,manifest,coverage-report
+envlist = lint,py{27,35,36,37,38,39},pypy,pypy3,manifest,coverage-report
+
+[gh-actions]
+python =
+    2.7: py27, coverage-report
+    3.5: py35, coverage-report
+    3.6: py36, coverage-report
+    3.7: py37, coverage-report
+    3.8: py38, coverage-report
+    3.9: py39, mypy, lint, manifest, coverage-report
+    pypy2: pypy, coverage-report
+    pypy3: pypy3, coverage-report
 
 [testenv]
 deps =
@@ -9,15 +20,9 @@ deps =
   sh
   click
   py{27,py}: ipython<6.0.0
-  py34{,-no-typing}: ipython<7.0.0
   py{35,36,37,38,39,py3}: ipython
 commands = coverage run --parallel -m pytest {posargs}
 
-[testenv:py34-no-typing]
-commands =
-  pip uninstall --yes typing
-  coverage run --parallel -m pytest -k 'not test_ipython' {posargs}
-
 [testenv:lint]
 skip_install = true
 deps =

From b158aa721cdf625c72f79f3583e5cc1f0cea2950 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Wed, 10 Mar 2021 22:36:01 +0100
Subject: [PATCH 08/22] Use UTF-8 as default encoding

The default value for the `encoding` paramter of `load_dotenv` and
`dotenv_values` is now `"utf-8"` instead of `None` (which selected the
encoding based on the user's locale).  It is passed directly to
`io.open`.

The rationale for this change is that the encoding of a project file
like `.env` should not depend on the user's locale by default.  UTF-8
makes sense as the default encoding since it is also used for Python
source files.  The main drawback is that it departs from `open`'s
default value of `None` for the `encoding` parameter.

The default value of `None` was a source of confusion for some users.
The Flask and Docker Compose projects already use `encoding="utf-8"` to
enforce the use of UTF-8 and avoid that sort of confusion.

This is a breaking change but only for users with a non-UTF-8 locale and
non-UTF-8 characters in their .env files.
---
 CHANGELOG.md       |  6 ++++-
 src/dotenv/main.py | 61 ++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index effa2510..1db10901 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,11 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-- Fix resolution order in variable expansion with `override=False` (#? by [@bbc2]).
+### Changed
+
+- The default value of the `encoding` parameter for `load_dotenv` and `dotenv_values` is
+  now `"utf-8"` instead of `None` (#? by [@bbc2]).
+- Fix resolution order in variable expansion with `override=False` (#287 by [@bbc2]).
 
 ## [0.15.0] - 2020-10-28
 
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
index 31c41ee7..16f22d2c 100644
--- a/src/dotenv/main.py
+++ b/src/dotenv/main.py
@@ -293,22 +293,63 @@ def _is_interactive():
     return ''
 
 
-def load_dotenv(dotenv_path=None, stream=None, verbose=False, override=False, interpolate=True, **kwargs):
-    # type: (Union[Text, _PathLike, None], Optional[_StringIO], bool, bool, bool, Union[None, Text]) -> bool
+def load_dotenv(
+    dotenv_path=None,
+    stream=None,
+    verbose=False,
+    override=False,
+    interpolate=True,
+    encoding="utf-8",
+):
+    # type: (Union[Text, _PathLike, None], Optional[_StringIO], bool, bool, bool, Optional[Text]) -> bool  # noqa
     """Parse a .env file and then load all the variables found as environment variables.
 
     - *dotenv_path*: absolute or relative path to .env file.
-    - *stream*: `StringIO` object with .env content.
-    - *verbose*: whether to output the warnings related to missing .env file etc. Defaults to `False`.
-    - *override*: where to override the system environment variables with the variables in `.env` file.
-                  Defaults to `False`.
+    - *stream*: `StringIO` object with .env content, used if `dotenv_path` is `None`.
+    - *verbose*: whether to output a warning the .env file is missing. Defaults to
+      `False`.
+    - *override*: whether to override the system environment variables with the variables
+      in `.env` file.  Defaults to `False`.
+    - *encoding*: encoding to be used to read the file.
+
+    If both `dotenv_path` and `stream`, `find_dotenv()` is used to find the .env file.
     """
     f = dotenv_path or stream or find_dotenv()
-    dotenv = DotEnv(f, verbose=verbose, interpolate=interpolate, override=override, **kwargs)
+    dotenv = DotEnv(
+        f,
+        verbose=verbose,
+        interpolate=interpolate,
+        override=override,
+        encoding=encoding,
+    )
     return dotenv.set_as_environment_variables()
 
 
-def dotenv_values(dotenv_path=None, stream=None, verbose=False, interpolate=True, **kwargs):
-    # type: (Union[Text, _PathLike, None], Optional[_StringIO], bool, bool, Union[None, Text]) -> Dict[Text, Optional[Text]]  # noqa: E501
+def dotenv_values(
+    dotenv_path=None,
+    stream=None,
+    verbose=False,
+    interpolate=True,
+    encoding="utf-8",
+):
+    # type: (Union[Text, _PathLike, None], Optional[_StringIO], bool, bool, Optional[Text]) -> Dict[Text, Optional[Text]]  # noqa: E501
+    """
+    Parse a .env file and return its content as a dict.
+
+    - *dotenv_path*: absolute or relative path to .env file.
+    - *stream*: `StringIO` object with .env content, used if `dotenv_path` is `None`.
+    - *verbose*: whether to output a warning the .env file is missing. Defaults to
+      `False`.
+      in `.env` file.  Defaults to `False`.
+    - *encoding*: encoding to be used to read the file.
+
+    If both `dotenv_path` and `stream`, `find_dotenv()` is used to find the .env file.
+    """
     f = dotenv_path or stream or find_dotenv()
-    return DotEnv(f, verbose=verbose, interpolate=interpolate, override=True, **kwargs).dict()
+    return DotEnv(
+        f,
+        verbose=verbose,
+        interpolate=interpolate,
+        override=True,
+        encoding=encoding,
+    ).dict()

From b96db46dc8b66adba8afcfd3ec3b8ed2b4d6cefe Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sat, 27 Mar 2021 10:00:25 +0100
Subject: [PATCH 09/22] Release version v0.16.0

---
 CHANGELOG.md          | 9 +++++++--
 setup.cfg             | 2 +-
 setup.py              | 2 +-
 src/dotenv/version.py | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1db10901..14f10d37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,14 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+_There are no unreleased changes at this time._
+
+## [0.16.0] - 2021-03-27
+
 ### Changed
 
 - The default value of the `encoding` parameter for `load_dotenv` and `dotenv_values` is
-  now `"utf-8"` instead of `None` (#? by [@bbc2]).
+  now `"utf-8"` instead of `None` (#306 by [@bbc2]).
 - Fix resolution order in variable expansion with `override=False` (#287 by [@bbc2]).
 
 ## [0.15.0] - 2020-10-28
@@ -239,7 +243,8 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@x-yuri]: https://github.com/x-yuri
 [@yannham]: https://github.com/yannham
 
-[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...HEAD
+[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...HEAD
+[0.16.0]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...v0.16.0
 [0.15.0]: https://github.com/theskumar/python-dotenv/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/theskumar/python-dotenv/compare/v0.13.0...v0.14.0
 [0.13.0]: https://github.com/theskumar/python-dotenv/compare/v0.12.0...v0.13.0
diff --git a/setup.cfg b/setup.cfg
index e882b8db..03e6644f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.15.0
+current_version = 0.16.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 530ab129..3fc452c5 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@ def read_files(files):
 
 setup(
     name="python-dotenv",
-    description="Add .env support to your django/flask apps in development and deployments",
+    description="Read key-value pairs from a .env file and set them as environment variables",
     long_description=long_description,
     long_description_content_type='text/markdown',
     version=meta['__version__'],
diff --git a/src/dotenv/version.py b/src/dotenv/version.py
index 9da2f8fc..5a313cc7 100644
--- a/src/dotenv/version.py
+++ b/src/dotenv/version.py
@@ -1 +1 @@
-__version__ = "0.15.0"
+__version__ = "0.16.0"

From efc51829f8e7693dbf4b7655169a9f852e9943d2 Mon Sep 17 00:00:00 2001
From: zueve <zueves@gmail.com>
Date: Thu, 28 Jan 2021 12:33:48 +0200
Subject: [PATCH 10/22] Add --override/--no-override flag to "dotenv run"

This makes it possible to not override previously defined environment
variables when running `dotenv run`.  It defaults to `--override` for
compatibility with the previous behavior.
---
 CHANGELOG.md      |  5 ++++-
 src/dotenv/cli.py | 15 ++++++++++++---
 tests/test_cli.py | 28 ++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14f10d37..5a5b276b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,9 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-_There are no unreleased changes at this time._
+### Added
+
+- Add `--override`/`--no-override` option to `dotenv run` (#312 by [@zueve] and [@bbc2]).
 
 ## [0.16.0] - 2021-03-27
 
@@ -242,6 +244,7 @@ _There are no unreleased changes at this time._
 [@venthur]: https://github.com/venthur
 [@x-yuri]: https://github.com/x-yuri
 [@yannham]: https://github.com/yannham
+[@zueve]: https://github.com/zueve
 
 [Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...HEAD
 [0.16.0]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...v0.16.0
diff --git a/src/dotenv/cli.py b/src/dotenv/cli.py
index e17d248f..51f25e8d 100644
--- a/src/dotenv/cli.py
+++ b/src/dotenv/cli.py
@@ -107,9 +107,14 @@ def unset(ctx, key):
 
 @cli.command(context_settings={'ignore_unknown_options': True})
 @click.pass_context
+@click.option(
+    "--override/--no-override",
+    default=True,
+    help="Override variables from the environment file with those from the .env file.",
+)
 @click.argument('commandline', nargs=-1, type=click.UNPROCESSED)
-def run(ctx, commandline):
-    # type: (click.Context, List[str]) -> None
+def run(ctx, override, commandline):
+    # type: (click.Context, bool, List[str]) -> None
     """Run command with environment variables present."""
     file = ctx.obj['FILE']
     if not os.path.isfile(file):
@@ -117,7 +122,11 @@ def run(ctx, commandline):
             'Invalid value for \'-f\' "%s" does not exist.' % (file),
             ctx=ctx
         )
-    dotenv_as_dict = {to_env(k): to_env(v) for (k, v) in dotenv_values(file).items() if v is not None}
+    dotenv_as_dict = {
+        to_env(k): to_env(v)
+        for (k, v) in dotenv_values(file).items()
+        if v is not None and (override or to_env(k) not in os.environ)
+    }
 
     if not commandline:
         click.echo('No command given.')
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 23404e70..a048ef3b 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -138,6 +138,34 @@ def test_run(tmp_path):
     assert result == "b\n"
 
 
+def test_run_with_existing_variable(tmp_path):
+    sh.cd(str(tmp_path))
+    dotenv_file = str(tmp_path / ".env")
+    with open(dotenv_file, "w") as f:
+        f.write("a=b")
+
+    result = sh.dotenv("run", "printenv", "a", _env={"LANG": "en_US.UTF-8", "a": "c"})
+
+    assert result == "b\n"
+
+
+def test_run_with_existing_variable_not_overridden(tmp_path):
+    sh.cd(str(tmp_path))
+    dotenv_file = str(tmp_path / ".env")
+    with open(dotenv_file, "w") as f:
+        f.write("a=b")
+
+    result = sh.dotenv(
+        "run",
+        "--no-override",
+        "printenv",
+        "a",
+        _env={"LANG": "en_US.UTF-8", "a": "c"},
+    )
+
+    assert result == "c\n"
+
+
 def test_run_with_none_value(tmp_path):
     sh.cd(str(tmp_path))
     dotenv_file = str(tmp_path / ".env")

From 6242550a53efe45ef53d9904fbb8c4257470c276 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sat, 27 Mar 2021 12:55:12 +0100
Subject: [PATCH 11/22] Use badge from GitHub Actions

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 127d46f0..7f0b2eb5 100644
--- a/README.md
+++ b/README.md
@@ -219,8 +219,8 @@ This project is currently maintained by [Saurabh Kumar](https://saurabh-kumar.co
 without the support of these [awesome
 people](https://github.com/theskumar/python-dotenv/graphs/contributors).
 
-[build_status_badge]: https://travis-ci.com/theskumar/python-dotenv.svg?branch=master
-[build_status_link]: https://travis-ci.com/theskumar/python-dotenv
+[build_status_badge]: https://github.com/theskumar/python-dotenv/actions/workflows/test.yml/badge.svg
+[build_status_link]: https://github.com/theskumar/python-dotenv/actions/workflows/test.yml
 [coverage_status_badge]: https://coveralls.io/repos/theskumar/python-dotenv/badge.svg?branch=master
 [coverage_status_link]: https://coveralls.io/r/theskumar/python-dotenv?branch=master
 [pypi_badge]: https://badge.fury.io/py/python-dotenv.svg

From f2eba2c1293b92f23bdf0d6a5b2e7210395dfedf Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sat, 27 Mar 2021 12:57:17 +0100
Subject: [PATCH 12/22] Remove outdated Coveralls badge

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 7f0b2eb5..f8d49562 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # python-dotenv
 
 [![Build Status][build_status_badge]][build_status_link]
-[![Coverage Status][coverage_status_badge]][coverage_status_link]
 [![PyPI version][pypi_badge]][pypi_link]
 
 Python-dotenv reads key-value pairs from a `.env` file and can set them as environment
@@ -221,8 +220,6 @@ people](https://github.com/theskumar/python-dotenv/graphs/contributors).
 
 [build_status_badge]: https://github.com/theskumar/python-dotenv/actions/workflows/test.yml/badge.svg
 [build_status_link]: https://github.com/theskumar/python-dotenv/actions/workflows/test.yml
-[coverage_status_badge]: https://coveralls.io/repos/theskumar/python-dotenv/badge.svg?branch=master
-[coverage_status_link]: https://coveralls.io/r/theskumar/python-dotenv?branch=master
 [pypi_badge]: https://badge.fury.io/py/python-dotenv.svg
 [pypi_link]: http://badge.fury.io/py/python-dotenv
 [python_streams]: https://docs.python.org/3/library/io.html

From 48c5c8e16c1dcb2188984f2245559cee37fe9db4 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 28 Mar 2021 17:55:18 +0200
Subject: [PATCH 13/22] Only display value with `dotenv get`

The `get` subcommand would return `key=value`, which is impractical to
retrieve the value of a key in a script.  Since the `key` is already
known by the caller, there is no point in showing it.

This also makes the output consistent with the documentation for the
subcommand.
---
 CHANGELOG.md      | 4 ++++
 src/dotenv/cli.py | 2 +-
 tests/test_cli.py | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a5b276b..8969b4c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+- Make `dotenv get <key>` only show the value, not `key=value` (#313 by [@bbc2]).
+
 ### Added
 
 - Add `--override`/`--no-override` option to `dotenv run` (#312 by [@zueve] and [@bbc2]).
diff --git a/src/dotenv/cli.py b/src/dotenv/cli.py
index 51f25e8d..bb96c023 100644
--- a/src/dotenv/cli.py
+++ b/src/dotenv/cli.py
@@ -85,7 +85,7 @@ def get(ctx, key):
         )
     stored_value = get_key(file, key)
     if stored_value:
-        click.echo('%s=%s' % (key, stored_value))
+        click.echo(stored_value)
     else:
         exit(1)
 
diff --git a/tests/test_cli.py b/tests/test_cli.py
index a048ef3b..b21725ca 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -35,7 +35,7 @@ def test_get_existing_value(cli, dotenv_file):
 
     result = cli.invoke(dotenv_cli, ['--file', dotenv_file, 'get', 'a'])
 
-    assert (result.exit_code, result.output) == (0, "a=b\n")
+    assert (result.exit_code, result.output) == (0, "b\n")
 
 
 def test_get_non_existent_value(cli, dotenv_file):
@@ -124,7 +124,7 @@ def test_get_default_path(tmp_path):
 
     result = sh.dotenv("get", "a")
 
-    assert result == "a=b\n"
+    assert result == "b\n"
 
 
 def test_run(tmp_path):

From cfca79a3cd384710c98651da79d66d964e0a65d1 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Fri, 2 Apr 2021 23:11:33 +0200
Subject: [PATCH 14/22] Release version 0.17.0

---
 CHANGELOG.md          | 5 +++--
 setup.cfg             | 2 +-
 src/dotenv/version.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8969b4c7..85076147 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.17.0] - 2021-04-02
 
 ### Changed
 
@@ -250,7 +250,8 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@yannham]: https://github.com/yannham
 [@zueve]: https://github.com/zueve
 
-[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...HEAD
+[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.17.0...HEAD
+[0.17.0]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...v0.16.0
 [0.15.0]: https://github.com/theskumar/python-dotenv/compare/v0.14.0...v0.15.0
 [0.14.0]: https://github.com/theskumar/python-dotenv/compare/v0.13.0...v0.14.0
diff --git a/setup.cfg b/setup.cfg
index 03e6644f..a2b27bfc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.16.0
+current_version = 0.17.0
 commit = True
 tag = True
 
diff --git a/src/dotenv/version.py b/src/dotenv/version.py
index 5a313cc7..fd86b3ee 100644
--- a/src/dotenv/version.py
+++ b/src/dotenv/version.py
@@ -1 +1 @@
-__version__ = "0.16.0"
+__version__ = "0.17.0"

From abde8e5e8409c70c05edadf379ec7308a4965c8c Mon Sep 17 00:00:00 2001
From: David Wesby <david.wesby@datalanguage.com>
Date: Tue, 13 Apr 2021 17:35:59 +0100
Subject: [PATCH 15/22] Fix stream parse example in README.md

In the existing example, the name "stream" is undefined, causing a
NameError.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8d49562..9757e672 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ from io import StringIO
 from dotenv import load_dotenv
 
 config = StringIO("USER=foo\nEMAIL=foo@example.org")
-load_dotenv(stream=stream)
+load_dotenv(stream=config)
 ```
 
 ### Load .env files in IPython

From 7d9b45a290b509c31daed780b97a3a3f15d25065 Mon Sep 17 00:00:00 2001
From: Karolina Surma <ksurma@redhat.com>
Date: Wed, 28 Apr 2021 14:27:28 +0200
Subject: [PATCH 16/22] Copy existing environment for usage in tests

Overriding the whole environment would remove critical variables like
`PYTHONPATH`. This would break tests on some systems like during Fedora
or Gentoo packaging.
---
 CHANGELOG.md      |  7 +++++++
 tests/test_cli.py | 16 ++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85076147..f623e61f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### Fixed
+
+- Fixed tests for build environments relying on `PYTHONPATH` (#318 by [@befeleme]).
+
 ## [0.17.0] - 2021-04-02
 
 ### Changed
@@ -232,6 +238,7 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@andrewsmith]: https://github.com/andrewsmith
 [@asyncee]: https://github.com/asyncee
 [@bbc2]: https://github.com/bbc2
+[@befeleme]: https://github.com/befeleme
 [@cjauvin]: https://github.com/cjauvin
 [@earlbread]: https://github.com/earlbread
 [@ekohl]: https://github.com/ekohl
diff --git a/tests/test_cli.py b/tests/test_cli.py
index b21725ca..bc6b8d47 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+import os
+
 import pytest
 import sh
 
@@ -143,8 +145,10 @@ def test_run_with_existing_variable(tmp_path):
     dotenv_file = str(tmp_path / ".env")
     with open(dotenv_file, "w") as f:
         f.write("a=b")
+    env = dict(os.environ)
+    env.update({"LANG": "en_US.UTF-8", "a": "c"})
 
-    result = sh.dotenv("run", "printenv", "a", _env={"LANG": "en_US.UTF-8", "a": "c"})
+    result = sh.dotenv("run", "printenv", "a", _env=env)
 
     assert result == "b\n"
 
@@ -154,14 +158,10 @@ def test_run_with_existing_variable_not_overridden(tmp_path):
     dotenv_file = str(tmp_path / ".env")
     with open(dotenv_file, "w") as f:
         f.write("a=b")
+    env = dict(os.environ)
+    env.update({"LANG": "en_US.UTF-8", "a": "c"})
 
-    result = sh.dotenv(
-        "run",
-        "--no-override",
-        "printenv",
-        "a",
-        _env={"LANG": "en_US.UTF-8", "a": "c"},
-    )
+    result = sh.dotenv("run", "--no-override", "printenv", "a", _env=env)
 
     assert result == "c\n"
 

From 303423864ae00f8d5f21cb39d6421a7d775a3daf Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Thu, 29 Apr 2021 21:01:14 +0200
Subject: [PATCH 17/22] Release version 0.17.1

---
 CHANGELOG.md          | 5 +++--
 setup.cfg             | 2 +-
 src/dotenv/version.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f623e61f..e4b81353 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.17.1] - 2021-04-29
 
 ### Fixed
 
@@ -257,7 +257,8 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@yannham]: https://github.com/yannham
 [@zueve]: https://github.com/zueve
 
-[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.17.0...HEAD
+[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.17.1...HEAD
+[0.17.1]: https://github.com/theskumar/python-dotenv/compare/v0.17.0...v0.17.1
 [0.17.0]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...v0.16.0
 [0.15.0]: https://github.com/theskumar/python-dotenv/compare/v0.14.0...v0.15.0
diff --git a/setup.cfg b/setup.cfg
index a2b27bfc..58054071 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.17.0
+current_version = 0.17.1
 commit = True
 tag = True
 
diff --git a/src/dotenv/version.py b/src/dotenv/version.py
index fd86b3ee..c6eae9f8 100644
--- a/src/dotenv/version.py
+++ b/src/dotenv/version.py
@@ -1 +1 @@
-__version__ = "0.17.0"
+__version__ = "0.17.1"

From b3c31954c2cb907935f77cde653783d4e5a05ec0 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sat, 29 May 2021 14:34:12 +0200
Subject: [PATCH 18/22] Improve quoting of values in `set_key`

The value of `quote_mode` must now be one of `auto`, `never` or
`always`, to ensure that users aren't accidentally relying on any other
value for their scripts to work.

Surrounding quotes are no longer stripped.  This makes it possible for
the user to control exactly what goes in the .env file.  Note that when
doing `dotenv set foo 'bar'` in Bash, the shell will have already
removed the quotes.

Single quotes are used instead of double quotes.  This avoids
accidentally having values interpreted by the parser or Bash (e.g. if
you set a password with `dotenv set password 'af$rb0'`.

Previously, the `auto` mode of quoting had the same effect as `always`.
This commit restores the functionality of `auto` by not quoting
alphanumeric values (which don't need quotes).  Plenty of other kinds of
values also don't need quotes but it's hard to know which ones without
actually parsing them, so we just omit quotes for alphanumeric values,
at least for now.
---
 CHANGELOG.md       | 13 +++++++++++++
 src/dotenv/main.py | 13 ++++++++-----
 tests/test_cli.py  | 13 +++++++------
 tests/test_main.py | 24 ++++++++++++------------
 4 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4b81353..0852d66e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Changed
+
+- Raise `ValueError` if `quote_mode` isn't one of `always`, `auto` or `never` in
+  `set_key` (#330 by [@bbc2]).
+- When writing a value to a .env file with `set_key` or `dotenv set <key> <value>` (#330
+  by [@bbc2]):
+  - Use single quotes instead of double quotes.
+  - Don't strip surrounding quotes.
+  - In `auto` mode, don't add quotes if the value is only made of alphanumeric characters
+    (as determined by `string.isalnum`).
+
 ## [0.17.1] - 2021-04-29
 
 ### Fixed
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
index 16f22d2c..b85836a5 100644
--- a/src/dotenv/main.py
+++ b/src/dotenv/main.py
@@ -151,13 +151,16 @@ def set_key(dotenv_path, key_to_set, value_to_set, quote_mode="always", export=F
     If the .env path given doesn't exist, fails instead of risking creating
     an orphan .env somewhere in the filesystem
     """
-    value_to_set = value_to_set.strip("'").strip('"')
+    if quote_mode not in ("always", "auto", "never"):
+        raise ValueError("Unknown quote_mode: {}".format(quote_mode))
 
-    if " " in value_to_set:
-        quote_mode = "always"
+    quote = (
+        quote_mode == "always"
+        or (quote_mode == "auto" and not value_to_set.isalnum())
+    )
 
-    if quote_mode == "always":
-        value_out = '"{}"'.format(value_to_set.replace('"', '\\"'))
+    if quote:
+        value_out = "'{}'".format(value_to_set.replace("'", "\\'"))
     else:
         value_out = value_to_set
     if export:
diff --git a/tests/test_cli.py b/tests/test_cli.py
index bc6b8d47..d2558234 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -73,10 +73,11 @@ def test_unset_non_existent_value(cli, dotenv_file):
 @pytest.mark.parametrize(
     "quote_mode,variable,value,expected",
     (
-        ("always", "HELLO", "WORLD", 'HELLO="WORLD"\n'),
-        ("never", "HELLO", "WORLD", 'HELLO=WORLD\n'),
-        ("auto", "HELLO", "WORLD", 'HELLO=WORLD\n'),
-        ("auto", "HELLO", "HELLO WORLD", 'HELLO="HELLO WORLD"\n'),
+        ("always", "a", "x", "a='x'\n"),
+        ("never", "a", "x", 'a=x\n'),
+        ("auto", "a", "x", "a=x\n"),
+        ("auto", "a", "x y", "a='x y'\n"),
+        ("auto", "a", "$", "a='$'\n"),
     )
 )
 def test_set_quote_options(cli, dotenv_file, quote_mode, variable, value, expected):
@@ -92,8 +93,8 @@ def test_set_quote_options(cli, dotenv_file, quote_mode, variable, value, expect
 @pytest.mark.parametrize(
     "dotenv_file,export_mode,variable,value,expected",
     (
-        (".nx_file", "true", "HELLO", "WORLD", "export HELLO=\"WORLD\"\n"),
-        (".nx_file", "false", "HELLO", "WORLD", "HELLO=\"WORLD\"\n"),
+        (".nx_file", "true", "a", "x", "export a='x'\n"),
+        (".nx_file", "false", "a", "x", "a='x'\n"),
     )
 )
 def test_set_export(cli, dotenv_file, export_mode, variable, value, expected):
diff --git a/tests/test_main.py b/tests/test_main.py
index b927d7f2..f36f7340 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -28,18 +28,18 @@ def test_set_key_no_file(tmp_path):
 @pytest.mark.parametrize(
     "before,key,value,expected,after",
     [
-        ("", "a", "", (True, "a", ""), 'a=""\n'),
-        ("", "a", "b", (True, "a", "b"), 'a="b"\n'),
-        ("", "a", "'b'", (True, "a", "b"), 'a="b"\n'),
-        ("", "a", "\"b\"", (True, "a", "b"), 'a="b"\n'),
-        ("", "a", "b'c", (True, "a", "b'c"), 'a="b\'c"\n'),
-        ("", "a", "b\"c", (True, "a", "b\"c"), 'a="b\\\"c"\n'),
-        ("a=b", "a", "c", (True, "a", "c"), 'a="c"\n'),
-        ("a=b\n", "a", "c", (True, "a", "c"), 'a="c"\n'),
-        ("a=b\n\n", "a", "c", (True, "a", "c"), 'a="c"\n\n'),
-        ("a=b\nc=d", "a", "e", (True, "a", "e"), 'a="e"\nc=d'),
-        ("a=b\nc=d\ne=f", "c", "g", (True, "c", "g"), 'a=b\nc="g"\ne=f'),
-        ("a=b\n", "c", "d", (True, "c", "d"), 'a=b\nc="d"\n'),
+        ("", "a", "", (True, "a", ""), "a=''\n"),
+        ("", "a", "b", (True, "a", "b"), "a='b'\n"),
+        ("", "a", "'b'", (True, "a", "'b'"), "a='\\'b\\''\n"),
+        ("", "a", "\"b\"", (True, "a", '"b"'), "a='\"b\"'\n"),
+        ("", "a", "b'c", (True, "a", "b'c"), "a='b\\'c'\n"),
+        ("", "a", "b\"c", (True, "a", "b\"c"), "a='b\"c'\n"),
+        ("a=b", "a", "c", (True, "a", "c"), "a='c'\n"),
+        ("a=b\n", "a", "c", (True, "a", "c"), "a='c'\n"),
+        ("a=b\n\n", "a", "c", (True, "a", "c"), "a='c'\n\n"),
+        ("a=b\nc=d", "a", "e", (True, "a", "e"), "a='e'\nc=d"),
+        ("a=b\nc=d\ne=f", "c", "g", (True, "c", "g"), "a=b\nc='g'\ne=f"),
+        ("a=b\n", "c", "d", (True, "c", "d"), "a=b\nc='d'\n"),
     ],
 )
 def test_set_key(dotenv_file, before, key, value, expected, after):

From dbf8c7bd50745f2f2e8dd1ead500efb998eda7c4 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 20 Jun 2021 13:45:48 +0200
Subject: [PATCH 19/22] Fix CI

Mypy was failing because the new version requires some type packages to
be installed even when `ignore_missing_imports` is set to `true`.
---
 tox.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tox.ini b/tox.ini
index e4d6f638..0f52ac23 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ python =
     3.6: py36, coverage-report
     3.7: py37, coverage-report
     3.8: py38, coverage-report
-    3.9: py39, mypy, lint, manifest, coverage-report
+    3.9: py39, lint, manifest, coverage-report
     pypy2: pypy, coverage-report
     pypy3: pypy3, coverage-report
 
@@ -27,7 +27,7 @@ commands = coverage run --parallel -m pytest {posargs}
 skip_install = true
 deps =
   flake8
-  mypy
+  mypy<0.900
 commands =
   flake8 src tests
   mypy --python-version=3.9 src tests

From 72bc30773962cb23cabee2c41f4317bf88b896e3 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 20 Jun 2021 17:04:17 +0200
Subject: [PATCH 20/22] Fix setuptools warning

---
 setup.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.cfg b/setup.cfg
index 58054071..3bb98964 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,7 +17,7 @@ exclude = .tox,.git,docs,venv,.venv
 ignore_missing_imports = true
 
 [metadata]
-description-file = README.md
+description_file = README.md
 
 [tool:pytest]
 testpaths = tests

From 3c08eaf8a0129440613525deef767d3dbd01019d Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 20 Jun 2021 18:18:15 +0200
Subject: [PATCH 21/22] Fix license metadata

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 3fc452c5..fd5785a9 100644
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@ def read_files(files):
         [console_scripts]
         dotenv=dotenv.cli:cli
     ''',
+    license='BSD-3-Clause',
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Programming Language :: Python',

From 97615cdcd0b6c6ffcf18b272598e82bfa3a18938 Mon Sep 17 00:00:00 2001
From: Bertrand Bonnefoy-Claudet <bertrand@bertrandbc.com>
Date: Sun, 20 Jun 2021 18:39:22 +0200
Subject: [PATCH 22/22] Release version 0.18.0

---
 CHANGELOG.md          | 5 +++--
 setup.cfg             | 2 +-
 src/dotenv/version.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0852d66e..7aa4cfd9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this
 project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.18.0] - 2021-06-20
 
 ### Changed
 
@@ -270,7 +270,8 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@yannham]: https://github.com/yannham
 [@zueve]: https://github.com/zueve
 
-[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.17.1...HEAD
+[Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.18.0...HEAD
+[0.18.0]: https://github.com/theskumar/python-dotenv/compare/v0.17.1...v0.18.0
 [0.17.1]: https://github.com/theskumar/python-dotenv/compare/v0.17.0...v0.17.1
 [0.17.0]: https://github.com/theskumar/python-dotenv/compare/v0.16.0...v0.17.0
 [0.16.0]: https://github.com/theskumar/python-dotenv/compare/v0.15.0...v0.16.0
diff --git a/setup.cfg b/setup.cfg
index 3bb98964..9afbc4b3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.17.1
+current_version = 0.18.0
 commit = True
 tag = True
 
diff --git a/src/dotenv/version.py b/src/dotenv/version.py
index c6eae9f8..1317d755 100644
--- a/src/dotenv/version.py
+++ b/src/dotenv/version.py
@@ -1 +1 @@
-__version__ = "0.17.1"
+__version__ = "0.18.0"