Skip to content

change requirements to use git https clone#84

Merged
nedbat merged 2 commits intoopenedx:masterfrom
xiangjf:xiangjf/change-requirements-to-use-git-https-clone
Jul 29, 2014
Merged

change requirements to use git https clone#84
nedbat merged 2 commits intoopenedx:masterfrom
xiangjf:xiangjf/change-requirements-to-use-git-https-clone

Conversation

@xiangjf
Copy link
Copy Markdown
Contributor

@xiangjf xiangjf commented Jun 17, 2014

Change requirements line for pika to use git https clone, as many corporates' firewall blocks the port for git protocol.
Also, requirements of other repos in edx use https clone as well.

@xiangjf xiangjf changed the title change-requirements-to-use-git-https-clone change requirements to use git https clone Jun 17, 2014
@nedbat
Copy link
Copy Markdown
Contributor

nedbat commented Jul 28, 2014

@xiangjf Thanks for this pull request, sorry it took so long for us to get to it.

  1. Can you please sign and return a Contributor's Agreement, as outlined in the edx-platform CONTRIBUTING file? And/or, if you are affiliated with an institution, that is also helpful information.

  2. Rather than merging master into your pull request, can you rebase on top of master? That keeps the commit history cleaner. Thanks.

@xiangjf
Copy link
Copy Markdown
Contributor Author

xiangjf commented Jul 29, 2014

@nedbat I have sent the signed Contributor's Agreement and rebased my pull request, thank you.

@e0d
Copy link
Copy Markdown
Contributor

e0d commented Jul 29, 2014

Looks good to me 👍

@nedbat
Copy link
Copy Markdown
Contributor

nedbat commented Jul 29, 2014

@xiangjf Thanks for the signed agreement!
This is good to merge.

nedbat added a commit that referenced this pull request Jul 29, 2014
…e-git-https-clone

change requirements to use git https clone
@nedbat nedbat merged commit 532754c into openedx:master Jul 29, 2014
@xiangjf xiangjf deleted the xiangjf/change-requirements-to-use-git-https-clone branch July 30, 2014 01:28
@jzoldak
Copy link
Copy Markdown

jzoldak commented Aug 4, 2014

@nedbat @e0d this broke master xqueue.
http://jenkins.edx.org:8080/job/xqueue/327/console

@e0d
Copy link
Copy Markdown
Contributor

e0d commented Aug 4, 2014

@jzoldak

The issue seems to be that the test script doesn't or a clean venv or pass -w when installing an updated requirement

18:44:03   git clone in /mnt/virtualenvs/xqueue/src/pika exists with URL git://github.com/pika/pika.git
18:44:03   The plan is to install the git repository https://github.com/pika/pika.git
18:44:03 What to do?  (s)witch, (i)gnore, (w)ipe, (b)ackup Exception:
18:44:03 Traceback (most recent call last):

@jzoldak
Copy link
Copy Markdown

jzoldak commented Aug 4, 2014

@e0d thanks for the troubleshooting.
I've wiped out the workspace for the job and kicked off another manual run.

Update: that build failed too, but I don't have time to look into it unfortunately.

@e0d
Copy link
Copy Markdown
Contributor

e0d commented Aug 5, 2014

@jzoldak It's the same error, so the venv must have survived wiping the work space.

Adding --exists-action w to the script should address this or forcing the venv to be re-created.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants