Replace all occurrences of install|global-options with install|global-option

Author: gvalkov

docs/reference/pip_install.rst

@@ -25,7 +25,7 @@ Each line of the requirements file indicates something to be installed,
 and like arguments to :ref:`pip install`, the following forms are supported::
 
     <requirement specifier>
-    <requirement specifier> [--install-options="..."] [--global-options="..."]
+    <requirement specifier> [--install-option="..."] [--global-option="..."]
     <archive url/path>
     [-e] <local project path>
     [-e] <vcs project url>
@@ -98,13 +98,13 @@ Some Examples:
 Per-requirement Overrides
 +++++++++++++++++++++++++
 
-It is possible to set ``--install-options`` and ``--global-options``
+It is possible to set ``--install-option`` and ``--global-option``
 for each requirement in the requirements file:
 
  ::
 
-    FooProject >= 1.2 --install-options="--prefix='/usr/local'" \
-                      --global-options="--no-user-cfg"
+    FooProject >= 1.2 --install-option="--prefix='/usr/local'" \
+                      --global-option="--no-user-cfg"
 
 The above translates roughly into running FooProject's ``setup.py``
 script as:

pip/req/req_file.py

@@ -44,11 +44,11 @@
 ])
 
 # The following options and flags can be used on requirement lines.
-# For example: INITools==0.2 --install-options="--prefix=/opt"
+# For example: INITools==0.2 --install-option="--prefix=/opt"
 parser_requirement_flags = set()
 parser_requirement_options = set([
-    '--install-options',
-    '--global-options',
+    '--install-option',
+    '--global-option',
 ])
 
 # The types of lines understood by the requirements file parser.
@@ -107,7 +107,7 @@ def parse_content(filename, content, finder=None, comes_from=None, options=None,
 
             # InstallRequirement.install() expects these options to be lists.
             if opts:
-                for opt in '--global-options', '--install-options':
+                for opt in '--global-option', '--install-option':
                     opts[opt] = shlex.split(opts[opt]) if opt in opts else []
 
             comes_from = '-r %s (line %s)' % (filename, line_number)

pip/req/req_install.py

@@ -784,8 +784,8 @@ def install(self, install_options, global_options=[], root=None):
         # Options specified in requirements file override those
         # specified on the command line, since the last option given
         # to setup.py is the one that is used.
-        global_options += self.options.get('--global-options', [])
-        install_options += self.options.get('--install-options', [])
+        global_options += self.options.get('--global-option', [])
+        install_options += self.options.get('--install-option', [])
 
         if self.isolated:
             global_options = list(global_options) + ["--no-user-cfg"]

tests/unit/test_req.py

@@ -466,25 +466,25 @@ def test_get_requirement_options():
     res = pro('--aflag --bflag', ['--aflag', '--bflag'])
     assert res == {'--aflag': '', '--bflag': ''}
 
-    res = pro('--install-options="--abc --zxc"', [], ['--install-options'])
-    assert res == {'--install-options': '--abc --zxc'}
+    res = pro('--install-option="--abc --zxc"', [], ['--install-option'])
+    assert res == {'--install-option': '--abc --zxc'}
 
-    res = pro('--aflag --global-options="--abc" --install-options="--aflag"',
-              ['--aflag'], ['--install-options', '--global-options'])
-    assert res == {'--aflag': '', '--global-options': '--abc', '--install-options': '--aflag'}
+    res = pro('--aflag --global-option="--abc" --install-option="--aflag"',
+              ['--aflag'], ['--install-option', '--global-option'])
+    assert res == {'--aflag': '', '--global-option': '--abc', '--install-option': '--aflag'}
 
-    line = 'INITools==2.0 --global-options="--one --two -3" --install-options="--prefix=/opt"'
+    line = 'INITools==2.0 --global-option="--one --two -3" --install-option="--prefix=/opt"'
     assert parse_line(line) == (REQUIREMENT, (
         'INITools==2.0', {
-            '--global-options': '--one --two -3',
-            '--install-options': '--prefix=/opt'
+            '--global-option': '--one --two -3',
+            '--install-option': '--prefix=/opt'
         }))
 
 
 def test_install_requirements_with_options(tmpdir, finder, session):
     content = '''
-    INITools == 2.0 --global-options="--one --two -3" \
-                    --install-options="--prefix=/opt"
+    INITools == 2.0 --global-option="--one --two -3" \
+                    --install-option"--prefix=/opt"
     '''
 
     req_path = tmpdir.join('requirements.txt')
@@ -504,4 +504,4 @@ def test_install_requirements_with_options(tmpdir, finder, session):
         for i in '--one', '--two', '-3', '--prefix=/opt':
             assert i in call
 
-    # TODO: assert that --global-options come before --install-options.
+    # TODO: assert that --global-option come before --install-option.