Skip to content

CLN: Remove references to user branch (follow up) #29603

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

Merged
jreback merged 1 commit into from
Nov 14, 2019
Merged

CLN: Remove references to user branch (follow up) #29603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions pandas/tests/io/excel/test_readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -499,13 +499,9 @@ def test_bad_engine_raises(self, read_ext):

@tm.network
def test_read_from_http_url(self, read_ext):
if read_ext == ".ods": # TODO: remove once on master
pytest.skip()

# TODO: alimcmaster1 - revert to master
url = (
"https://raw.githubusercontent.com/alimcmaster1"
"/pandas/mcmali-tests-dir-struct/"
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"pandas/tests/io/data/excel/test1" + read_ext
)
url_table = pd.read_excel(url)
Expand Down
4 changes: 1 addition & 3 deletions pandas/tests/io/test_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,8 @@ def test_banklist_url(self):

@tm.network
def test_spam_url(self):
# TODO: alimcmaster1 - revert to master
url = (
"https://raw.githubusercontent.com/alimcmaster1/"
"pandas/mcmali-tests-dir-struct/"
"https://raw.githubusercontent.com/pandas-dev/pandas/master/"
"pandas/tests/io/data/html/spam.html"
)
df1 = self.read_html(url, ".*Water.*")
Expand Down