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.

Sign up for GitHub

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

Jump to bottom

Create directory structure for metric queries #65

Merged
merged 18 commits into from
Jun 29, 2019
Merged

Create directory structure for metric queries #65

merged 18 commits into from
Jun 29, 2019

Conversation

KJLarson
Copy link
Contributor

@KJLarson KJLarson commented Jun 26, 2019 •
edited
Loading

Progress on #62

KJLarson and others added 16 commits June 18, 2019 17:58
@KJLarson
Create contributors.json
31d77b9
@KJLarson
Merge branch 'master' of https://github.com/HTTPArchive/almanac.httpa…
1c63158 
…rchive.org into add-contributors

Update add-contributors branch
@KJLarson
Add data structure and samples. Progress on HTTPArchive#51
1611f63
@KJLarson
Add code to get and display contributors data. Progress on HTTPArchiv…
5d63342 
…e#51
@KJLarson @rviscomi
Remove import jsonify
ae90b4f 
Co-Authored-By: Rick Viscomi <rviscomi@users.noreply.github.com>
@KJLarson @rviscomi
Update render_template in src/main.py. Progress on HTTPArchive#57.
619bc30 
Co-Authored-By: Rick Viscomi <rviscomi@users.noreply.github.com>
@KJLarson
Restructure team data. Progress on HTTPArchive#57
35b1239
@KJLarson @rviscomi
Add method to update contributors. Progress on HTTPArchive#57
a410bc6 
Co-Authored-By: Rick Viscomi <rviscomi@users.noreply.github.com>
@KJLarson @rviscomi
Declare global variable first
1fa1f55 
Co-Authored-By: Rick Viscomi <rviscomi@users.noreply.github.com>
@KJLarson
Remove comments
9a3ba5a
@KJLarson
Merge branch 'add-contributors' of https://github.com/KJLarson/almana…
7015985 
…c.httparchive.org into add-contributors
@KJLarson @rviscomi
Add loop to render contributor's team. Progress on HTTPArchive#57
1b38575 
Co-Authored-By: Rick Viscomi <rviscomi@users.noreply.github.com>
@KJLarson
Merge branch 'add-contributors' of https://github.com/KJLarson/almana…
482f8b0 
…c.httparchive.org into add-contributors
@KJLarson
make user IDs lowercase
f87bff4
@KJLarson
remove contributors GitHub and Twitter
1be86a4
@KJLarson
Add directories for sql queries and sql queries for first metric in e…
a1ec011 
…ach chapter. Progress on HTTPArchive#62
rviscomi
rviscomi requested changes Jun 27, 2019
View reviewed changes
Copy link
Member

@rviscomi rviscomi left a comment

Choose a reason for hiding this comment

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

Thanks Kari! Just one request to remove the Contributors changes, then this is good to go.

src/config/contributors.json Outdated
@@ -0,0 +1,52 @@
{
Copy link
Member

Choose a reason for hiding this comment

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

This PR should be limited to the SQL directories only. Changes related to the contributors PR should be removed.

Copy link
Contributor Author

@KJLarson KJLarson Jun 27, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Oh, yes. I was having some issues switching between branches, and I think I did some stuff in the wrong order. I think I figured out what I need to do for the future. As soon as I figure out how to remove the contributors stuff from this branch I will do so!

Copy link
Member

Choose a reason for hiding this comment

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

You should be able to straight up delete the files from within this branch and make a new commit that logs those deletions. They'll still exist in the other branch.

I think what might have happened was that you branched from that branch, which included all of its changes. Tip: I always sync/branch from master to ensure a clean branch.

Copy link
Member

Choose a reason for hiding this comment

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

contributors.json is still showing up in the PR. Can you delete it? Then this should be good to go.

@rviscomi rviscomi changed the title Add queries Create directory structure for metric queries Jun 27, 2019
@rviscomi
Copy link
Member

It's also good practice to include a short note in the top comment about the issue this PR is addressing. For example, in this case Progress on #62. Or for example if you're resolving an issue you can write Fixes #62. Could you edit your first comment with a note like this?

rviscomi
rviscomi requested changes Jun 28, 2019
View reviewed changes
src/config/contributors.json Outdated
@@ -0,0 +1,52 @@
{
Copy link
Member

Choose a reason for hiding this comment

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

contributors.json is still showing up in the PR. Can you delete it? Then this should be good to go.

rviscomi
rviscomi approved these changes Jun 29, 2019
View reviewed changes
Copy link
Member

@rviscomi rviscomi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

👍

Congrats @KJLarson on merging your first PR to the Almanac! 🎉

@rviscomi rviscomi added the development Building the Almanac tech stack label Jun 29, 2019
@rviscomi rviscomi added this to the Infrastructure prepared milestone Jun 29, 2019
@rviscomi rviscomi merged commit ab37c5a into HTTPArchive:master Jun 29, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rviscomi rviscomi rviscomi approved these changes

Assignees
No one assigned
Labels
development Building the Almanac tech stack
Projects
None yet
Milestone
Infrastructure prepared
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@KJLarson @rviscomi