Fix a couple of pip requirement lines (#651)

A change in the strictness of how pip requirements lines are parsed
means that the lib needs a tactical fix to enable testing to move
forwards.  A more complete fix is to remove the upper bounds and the
main development branch.

setup.py

@@ -52,7 +52,7 @@
         'pathspec<0.11;python_version >= "3.7"',
         'otherstuf<=1.1.0',
         'path.py>=10.5,<13',
-        'pip>=1.5.4<23',
+        'pip>=1.5.4,<23',
         'jujubundlelib<0.6',
         'virtualenv>=1.11.4,<21',
         'colander<1.9',

tests/test_build.py

@@ -486,7 +486,7 @@ def _store_wheelhouses(args, **kwargs):
                         '',
                         '# --wheelhouse-overrides',
                         'git+https://github.com/me/qux#egg=qux',
-                        'setuptools_scm>=3.0<=3.4.1',
+                        'setuptools_scm>=3.0,<=3.4.1',
                         '',
                     ])
 

tests/wh-over.txt

@@ -1,2 +1,2 @@
 git+https://github.com/me/qux#egg=qux
-setuptools_scm>=3.0<=3.4.1
+setuptools_scm>=3.0,<=3.4.1