Skip to content
This repository was archived by the owner on Mar 14, 2021. It is now read-only.

Team 16 #9

Open
supposedly wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Team 16 #9

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
66897bc
Basic info fetching
supposedly Mar 23, 2018
0fcaccd
Update Pipfile
supposedly Mar 23, 2018
72c5e27
Re-add typehints, fix bs4 inefficiency and dupes
supposedly Mar 24, 2018
60ea12a
Impl proper markdown
supposedly Mar 24, 2018
c56db82
Input validation
supposedly Mar 24, 2018
a8d59f7
Impl random snek fetching
supposedly Mar 24, 2018
3203bc0
Implement snake emoji
supposedly Mar 24, 2018
d3661d0
Properly update Pipfile & restore pipenv lock
supposedly Mar 25, 2018
3bd8023
Change some names
supposedly Mar 25, 2018
4d1b47b
Merge pull request #3 from discord-python/code-jam-1
supposedly Mar 25, 2018
bb1f6bc
Merge branch 'pulling'
supposedly Mar 25, 2018
8cd8e43
Impl python special case
supposedly Mar 25, 2018
e043abb
Implement disambiguation
supposedly Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ name = "pypi"

[packages]
"72eb2aa" = {file = "https://github.com/Rapptz/discord.py/archive/rewrite.zip"}
aiohttp = "*"
aiodns = "*"
bs4 = "*"
html2text = "*"
Copy link
Copy Markdown
Contributor

@gdude2002 gdude2002 Mar 23, 2018

Choose a reason for hiding this comment

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

You have edited the Pipfile directly, and in a way that will break discord.py. Please revert your Pipfile and read over the doc/ folder again.

Copy link
Copy Markdown
Author

@supposedly supposedly Mar 23, 2018

Choose a reason for hiding this comment

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

I don't believe we'd had this change to the Pipfile PR'd yet, because I don't remember deleting the aiohttp/websockets lines. But also -- doesn't discord.py itself pin these two deps in its own requirements.txt?

Copy link
Copy Markdown
Contributor

@gdude2002 gdude2002 Mar 23, 2018

Choose a reason for hiding this comment

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

It does pin aiohttp and websockets, but Pipenv doesn't pick up on it correctly if they aren't specified directly in the pipfile. You also can't just use the latest version of aiohttp, it's not compatible.

I make a PR this morning, maybe check that out.

Copy link
Copy Markdown
Author

@supposedly supposedly Mar 23, 2018

Choose a reason for hiding this comment

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

Gotcha, & just saw that! I'll fix all this as soon as I get home.


[dev-packages]
"flake8" = "*"
Expand Down
300 changes: 0 additions & 300 deletions Pipfile.lock
View file
Open in desktop

This file was deleted.

Loading