From 6dfabb9901280e3aff2cb51d4c06acba575f2832 Mon Sep 17 00:00:00 2001
From: Timothy Crosley <timothy.crosley@gmail.com>
Date: Sun, 3 Mar 2019 12:45:42 -0800
Subject: Pull request to merge in latest hotfix master changes into develop
 branch

---
 .travis.yml               |  9 ++++++++-
 CHANGELOG.md              | 13 +++++++++++--
 isort/__init__.py         |  2 +-
 isort/settings.py         |  2 +-
 scripts/before_install.sh | 28 ++++++++++++++++++++++++++++
 setup.py                  |  2 +-
 6 files changed, 50 insertions(+), 6 deletions(-)
 create mode 100755 scripts/before_install.sh

diff --git a/.travis.yml b/.travis.yml
index 0cd3f4c2..5c96e81e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,9 +19,16 @@ matrix:
     - python: 3.7
       env: TOXENV=py37-coverage
     - python: pypy3.5-6.0
-      env: TOXENV=pypy3
+    - os: osx
+      language: generic
+      env: TOXENV=py36
+
+before_install:
+  - ./scripts/before_install.sh
+
 install:
   - pip install tox
+
 script:
   - tox
 after_success:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6635a5af..a19bee52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,10 +12,19 @@ Internal:
 Planned:
   - profile support for common project types (black, django, google, etc)
 
-### 4.3.9 - Feburary 25, 2019 - hot fix release
+### 4.3.10 - March 2, 2019 - hot fix release
+- Fixed Windows incompatibilities (Issue #835)
+- Fixed relative import sorting bug (Issue #417)
+- Fixed "no_lines_before" to also be respected from previous empty sections.
+- Fixed slow-down introduced by finders mechanism by adding a LRU cache (issue #848)
+- Fixed issue #842 default encoding not-set in Python2
+- Restored Windows automated testing
+- Added Mac automated testing
+
+### 4.3.9 - February 25, 2019 - hot fix release
 - Fixed a bug that led to an incompatibility with black: #831
 
-### 4.3.8 - Feburary 25, 2019 - hot fix release
+### 4.3.8 - February 25, 2019 - hot fix release
 - Fixed a bug that led to the recursive option not always been available from the command line.
 
 ### 4.3.7 - February 25, 2019 - hot fix release
diff --git a/isort/__init__.py b/isort/__init__.py
index 63034de6..e3af789b 100644
--- a/isort/__init__.py
+++ b/isort/__init__.py
@@ -22,4 +22,4 @@ OTHER DEALINGS IN THE SOFTWARE.
 from . import settings  # noqa: F401
 from .isort import SortImports  # noqa: F401
 
-__version__ = "4.3.9"
+__version__ = "4.3.10"
diff --git a/isort/settings.py b/isort/settings.py
index 06d1e70d..048b0bb7 100644
--- a/isort/settings.py
+++ b/isort/settings.py
@@ -315,7 +315,7 @@ def _get_config_data(file_path: str, sections: Iterable[str]) -> Dict[str, Any]:
                     settings.update(config_section)
             else:
                 warnings.warn(
-                    "Found %s but toml package is not installed. To configure"
+                    "Found %s but toml package is not installed. To configure "
                     "isort with %s, install with 'isort[pyproject]'." % (file_path, file_path)
                 )
         else:
diff --git a/scripts/before_install.sh b/scripts/before_install.sh
new file mode 100755
index 00000000..fa86a770
--- /dev/null
+++ b/scripts/before_install.sh
@@ -0,0 +1,28 @@
+#! /bin/bash
+
+echo $TRAVIS_OS_NAME
+
+ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
+
+    # Travis has an old version of pyenv by default, upgrade it
+    brew update > /dev/null 2>&1
+    brew outdated pyenv || brew upgrade pyenv
+
+    pyenv --version
+
+    # Find the latest requested version of python
+    case "$TOXENV" in
+        py34)
+            python_minor=4;;
+        py35)
+            python_minor=5;;
+        py36)
+            python_minor=6;;
+        py37)
+            python_minor=7;;
+    esac
+    latest_version=`pyenv install --list | grep -e "^[ ]*3\.$python_minor" | tail -1`
+
+    pyenv install $latest_version
+    pyenv local $latest_version
+fi
diff --git a/setup.py b/setup.py
index 6858ad4e..3a4360b7 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open('README.rst') as f:
     readme = f.read()
 
 setup(name='isort',
-      version='4.3.9',
+      version='4.3.10',
       description='A Python utility / library to sort Python imports.',
       long_description=readme,
       author='Timothy Crosley',
-- 
cgit v1.2.1


From d1a4681c418c61356289e29b9235aa23acfecaff Mon Sep 17 00:00:00 2001
From: Timothy Crosley <timothy.crosley@gmail.com>
Date: Sun, 3 Mar 2019 13:00:06 -0800
Subject: Re-add missing environment varieable

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

diff --git a/.travis.yml b/.travis.yml
index 5c96e81e..4b6ded30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ matrix:
     - python: 3.7
       env: TOXENV=py37-coverage
     - python: pypy3.5-6.0
+      env: TOXENV=pypy3
     - os: osx
       language: generic
       env: TOXENV=py36
-- 
cgit v1.2.1