From 6a66fbe6b32c0f2259f04963b665891b68511917 Mon Sep 17 00:00:00 2001
From: DongHun Kwak <dh0128.kwak@samsung.com>
Date: Mon, 14 Jan 2019 10:32:00 +0900
Subject: [PATCH] Imported Upstream version 35.0.0

---
 CHANGES.rst                    | 13 +++++++++++++
 docs/setuptools.txt            |  7 +++++++
 setup.cfg                      |  2 +-
 setup.py                       |  2 +-
 setuptools/command/egg_info.py |  2 --
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 18583f0..e669148 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,16 @@
+v35.0.0
+-------
+
+* #436: In egg_info.manifest_maker, no longer read
+  the file list from the manifest file, and instead
+  re-build it on each build. In this way, files removed
+  from the specification will not linger in the manifest.
+  As a result, any files manually added to the manifest
+  will be removed on subsequent egg_info invocations.
+  No projects should be manually adding files to the
+  manifest and should instead use MANIFEST.in or SCM
+  file finders to force inclusion of files in the manifest.
+
 v34.4.1
 -------
 
diff --git a/docs/setuptools.txt b/docs/setuptools.txt
index bf5bb8c..eb9fdbd 100644
--- a/docs/setuptools.txt
+++ b/docs/setuptools.txt
@@ -1176,6 +1176,8 @@ Distributing a ``setuptools``-based project
 Using ``setuptools``...  Without bundling it!
 ---------------------------------------------
 
+.. warning:: **ez_setup** is deprecated in favor of PIP with **PEP-518** support.
+
 Your users might not have ``setuptools`` installed on their machines, or even
 if they do, it might not be the right version.  Fixing this is easy; just
 download `ez_setup.py`_, and put it in the same directory as your ``setup.py``
@@ -2277,6 +2279,11 @@ New in 20.1: Added keyring support.
 Configuring setup() using setup.cfg files
 -----------------------------------------
 
+.. note:: New in 30.3.0 (8 Dec 2016).
+
+.. important:: ``setup.py`` with ``setup()`` function call is still required even 
+                if your configuration resides in ``setup.cfg``.
+
 ``Setuptools`` allows using configuration files (usually `setup.cfg`)
 to define package’s metadata and other options which are normally supplied
 to ``setup()`` function.
diff --git a/setup.cfg b/setup.cfg
index 686da2f..57ca3d5 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 34.4.1
+current_version = 35.0.0
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 798cf84..328941c 100755
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="34.4.1",
+    version="35.0.0",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 1a6ea9c..21bbfb7 100755
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -564,8 +564,6 @@ class manifest_maker(sdist):
         rcfiles = list(walk_revctrl())
         if rcfiles:
             self.filelist.extend(rcfiles)
-        elif os.path.exists(self.manifest):
-            self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 
-- 
2.7.4