Unresolved conflict in pubsub/cloud-client/requirements.txt file #1550

Activity

1. techieshark commented on Jul 14, 2018

   

   techieshark

   on Jul 14, 2018

   More actions

   Here's the exact spot that's broken.

   Easy to reproduce:

   git clone git@github.com:GoogleCloudPlatform/python-docs-samples.git
   cd python-docs-samples/pubsub/cloud-client/
   pip install -r requirements.txt
   

   results in a glaring problem from pip:

   Invalid requirement: '<<<<<<< HEAD'
   Traceback (most recent call last):
     File "/usr/local/lib/python2.7/site-packages/pip/_internal/req/req_install.py", line 252, in from_line
       req = Requirement(req)
     File "/usr/local/lib/python2.7/site-packages/pip/_vendor/packaging/requirements.py", line 97, in __init__
       requirement_string[e.loc:e.loc + 8]))
   InvalidRequirement: Invalid requirement, parse error at "u'<<<<<<< '"
   

   ("'<<<<<<< HEAD") is the dead giveaway. Must have accidentally been missed during a merge (thanks, git!).
2. nnegrey

   added

   Data Analytics / ML / IoT

   on Nov 30, 2018
3. nnegrey commented on Dec 14, 2018

   

   nnegrey

   on Dec 14, 2018

   Contributor

   More actions

   This issue appears to have been fixed. Please feel free to reopen if that is not the case. :)
4. nnegrey

   closed this as completedon Dec 14, 2018