这是indexloc提供的服务,不要输入任何密码
Skip to content

Conversation

@akornor
Copy link
Contributor

@akornor akornor commented May 18, 2016

news functionality implemented using new york times articles api

@akornor
Copy link
Contributor Author

akornor commented May 18, 2016

wit ai needs training to get intent of query in test_news





Copy link
Owner

Choose a reason for hiding this comment

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

empty lines

@swapagarwal
Copy link
Owner

Hey @Badmon, nice work!
By the way, did you see the attribution guidelines of the API?

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

I just did, seems to me we aren't breaking any rules ?

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

what further progress is there before branch gets merged?

@swapagarwal
Copy link
Owner

swapagarwal commented May 28, 2016

See https://developer.nytimes.com/branding, need to add "Data provided by The New York Times" at the end.
And remove the empty lines in news.py

@swapagarwal
Copy link
Owner

I've trained wit.ai, the tests are now passing! 🎉
Also, can you rebase your work on master so that merge conflicts are resolved?

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

deleted my branch by mistaken -- is it possible for me to create another news-feature branch ?

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

oh my bad -- git reflog 👍

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

funny thing is cant seem to find a template that allows me to display "data provided by new york times"

@swapagarwal
Copy link
Owner

Keep the snippet in the subtitle, and put the attribution in place of 'View on Web'.

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

alright, on it!

@swapagarwal
Copy link
Owner

still merge conflicts, kindly sync your fork with upstream

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

i have, still having conflicts

@swapagarwal
Copy link
Owner

The conflict is in line number 6 in config.py
JOKES_SOURCE_FILE = 'data/jokes.json'

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

done ?

template.set_post_text('\nCommunity Rating: ' + str(data[0]['community_rating']) + '\nStatus: ' + data[0]['status'])
#only want to see 2 decimal places
rating = {0:.2f}.format(data[0]['community_rating'])
template.set_post_text('\nCommunity Rating: ' + str(rating) + '\nStatus: ' + data[0]['status'])
Copy link
Owner

Choose a reason for hiding this comment

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

this goes in separate PR

@akornor
Copy link
Contributor Author

akornor commented May 28, 2016

i just realized how terrible i am at git, i will do that soon

@swapagarwal
Copy link
Owner

No problem, take your time 😄 Let me know if you need any help!
Using it is how you learn. Cheers!

@akornor
Copy link
Contributor Author

akornor commented May 29, 2016

want commands do i run to resolve the conflicts ? i tried git fetch upstream && git merge upstream/master

@swapagarwal
Copy link
Owner

Nice work! Conflicts have been resolved.
Just one last thing, there should be changes in only 4 files here

@@ -1,4 +1,5 @@
{

Copy link
Owner

Choose a reason for hiding this comment

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

no need

@swapagarwal
Copy link
Owner

Merged in #147

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants