From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Mon, 14 Jan 2019 01:35:35 +0000 (+0900)
Subject: Imported Upstream version 36.7.1
X-Git-Tag: upstream/36.7.1^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1fa311b67d83a798c56edeb298ba58fab14697ae;p=platform%2Fupstream%2Fpython-setuptools.git

Imported Upstream version 36.7.1
---

diff --git a/CHANGES.rst b/CHANGES.rst
index 9341c92..f17e79c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,9 @@
+v36.7.1
+-------
+
+* #1193: Avoid test failures in bdist_egg when
+  PYTHONDONTWRITEBYTECODE is set.
+
 v36.7.0
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 94dfbd6..d1d94cd 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.7.0
+current_version = 36.7.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 389a805..2c4ba84 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.7.0",
+    version="36.7.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",
diff --git a/setuptools/tests/test_bdist_egg.py b/setuptools/tests/test_bdist_egg.py
index 61615b3..54742aa 100644
--- a/setuptools/tests/test_bdist_egg.py
+++ b/setuptools/tests/test_bdist_egg.py
@@ -44,6 +44,10 @@ class Test:
         [content] = os.listdir('dist')
         assert re.match(r'foo-0.0.0-py[23].\d.egg$', content)
 
+    @pytest.mark.xfail(
+        os.environ.get('PYTHONDONTWRITEBYTECODE'),
+        reason="Byte code disabled",
+    )
     def test_exclude_source_files(self, setup_context, user_override):
         dist = Distribution(dict(
             script_name='setup.py',