Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add django #120

Merged
merged 8 commits into from
Feb 20, 2018
Merged

Add django #120

merged 8 commits into from
Feb 20, 2018

Conversation

waghanza
Copy link
Collaborator

No description provided.

@waghanza waghanza mentioned this pull request Feb 15, 2018
@waghanza waghanza changed the title Add django [WIP] Add django Feb 15, 2018
@waghanza waghanza changed the title [WIP] Add django Add django Feb 15, 2018
waghanza and others added 5 commits February 19, 2018 13:40
* npm lock file are json one, not using lock extension

* remove already versionned npm lock files
@waghanza
Copy link
Collaborator Author

Hi,

@tbrand I think this PR (in fact conflict resolution) is polluting git history. To avoid this, I think using squash commit (instead of default merge one) SHOULD fix this ;-)

Regards,

@tbrand
Copy link
Collaborator

tbrand commented Feb 19, 2018

Thanks! 👍
Actually I did squash merge from some point. Thanks for the advice.

# ```
# ./bin/benchmarker flast
# ```
# {name: "flask", repo: "pallets/flask"},
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flask is not working for me now. Did you try it?

./bin/benchmerker flask

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, with make

it was done in #108, except if I mess up my working directory 😉

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, after merging #108, it's still failing for me. But ok, will try it again. Thanks!

@tbrand tbrand merged commit 288ffae into the-benchmarker:master Feb 20, 2018
@tbrand
Copy link
Collaborator

tbrand commented Feb 20, 2018

Awesome! 🎉

@waghanza waghanza deleted the add_django branch February 20, 2018 08:13
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.

None yet

2 participants