Skip to content

Weather add#13

Closed
antixcode6 wants to merge 9 commits intoswapagarwal:masterfrom
antixcode6:weather
Closed

Weather add#13
antixcode6 wants to merge 9 commits intoswapagarwal:masterfrom
antixcode6:weather

Conversation

@antixcode6
Copy link

No description provided.

.idea/vcs.xml Outdated
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project> No newline at end of file
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 to check in this file

@swapagarwal
Copy link
Owner

Hi @antixcode6, thank you for taking the time to add a new module.
A lot of users were querying for weather and this came up just in time! 😄
Take a look at the lines that I have commented on, and we'll be ready to merge.

config.py Outdated
ACCESS_TOKEN = '<ACCESS_TOKEN>'
VERIFY_TOKEN = '<VERIFY_TOKEN>'
WIT_AI_ACCESS_TOKEN = 'IKJJJYYVR3X672DHFVS7U7C4L2MQSS2P'
OPEN_WEATHER_MAP_ACCESS_TOKEN = 'adee94563461cdf1dcfe25956aea10ae'
Copy link
Owner

@swapagarwal swapagarwal Apr 23, 2016

Choose a reason for hiding this comment

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

Replace the token with the placeholder, i've set it up on the server.

@swapagarwal
Copy link
Owner

Whoa, that was fast!
Two files (idea/vcs and src/movie) need to be removed and just a few more changes (see comments)

@swapagarwal swapagarwal force-pushed the master branch 2 times, most recently from 70a69c4 to 656727f Compare April 23, 2016 09:32
@antixcode6
Copy link
Author

Worked on the further suggestions; was just curious if module was good to go

from src import *

WIT_AI_ACCESS_TOKEN = os.environ.get('WIT_AI_ACCESS_TOKEN', config.WIT_AI_ACCESS_TOKEN)

Copy link
Owner

Choose a reason for hiding this comment

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

add a blank line here to remove this file from diff

@swapagarwal
Copy link
Owner

See here https://github.com/swapagarwal/JARVIS-on-Messenger/pull/13/files
There are 6 files changed while there should be only 3.

@swapagarwal
Copy link
Owner

Why delete movie.py?

@antixcode6
Copy link
Author

Was just trying to remove it from this pull request since it had no place being there

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