Revert "fix `install_requires` handling of extras"

This reverts commit a3ec721ec1e70f1f7aec6c3349ad85b446410809.

1 files changed, 4 insertions, 7 deletions

diff --git a/setuptools/dist.py b/setuptools/dist.py
index 50f5c18f..f6bf2601 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -376,7 +376,7 @@ class Distribution(Distribution_parse_config_files, _Distribution):
     def _move_install_requirements_markers(self):
         """
         Move requirements in `install_requires` that are using environment
-        markers or extras to `extras_require`.
+        markers `extras_require`.
         """
 
         # divide the install_requires into two sets, simple ones still
@@ -384,7 +384,7 @@ class Distribution(Distribution_parse_config_files, _Distribution):
         # by extras_require.
 
         def is_simple_req(req):
-            return not req.marker and not req.extras
+            return not req.marker
 
         spec_inst_reqs = getattr(self, 'install_requires', None) or ()
         simple_reqs = filter(
@@ -398,9 +398,7 @@ class Distribution(Distribution_parse_config_files, _Distribution):
         self.install_requires = list(map(str, simple_reqs))
 
         for r in complex_reqs:
-            suffix = ':' + str(r.marker) if r.marker else ''
-            for section in r.extras or ('',):
-                self._tmp_extras_require[section + suffix].append(r)
+            self._tmp_extras_require[':' + str(r.marker)].append(r)
         self.extras_require = dict(
             (k, [str(r) for r in map(self._clean_req, v)])
             for k, v in self._tmp_extras_require.items()
@@ -408,9 +406,8 @@ class Distribution(Distribution_parse_config_files, _Distribution):
 
     def _clean_req(self, req):
         """
-        Given a Requirement, remove extras and markers and return it.
+        Given a Requirement, remove environment markers and return it.
         """
-        req.extras = ()
         req.marker = None
         return req