Skip to content
This repository was archived by the owner on Oct 17, 2024. It is now read-only.

remove else clause of resolved PR 6419 - #257

Merged
bsipocz merged 2 commits into
astropy:masterfrom
kain88-de:remove-else
Nov 29, 2017
Merged

bsipocz merged 2 commits into
astropy:masterfrom
kain88-de:remove-else

Conversation

@kain88-de

Copy link
Copy Markdown
Contributor

astropy/astropy#6419 has been resolved and there is a mark that the else should be removed again.

I saw that when I now noticed that ci-helper don't install the latest version of pytest.

@bsipocz

bsipocz commented Nov 18, 2017

Copy link
Copy Markdown
Member

Thanks @kain88-de. However I'm afraid there are still quite a few package out there that I would like to check whether they work before removing this version pinning. I'm away this coming week, once back I'll try to do those checks and come back to this PR.

In the meantime the workaround to use newer pytest is to specify the PYTEST_VERSION variable to be >3.2.

@bsipocz
bsipocz self-requested a review November 18, 2017 22:11
@bsipocz bsipocz self-assigned this Nov 18, 2017
@kain88-de

Copy link
Copy Markdown
Contributor Author

Yeah I set that as well. Just thought i remove it to follow the instructions of the comment. I’m also OK to wait no hurry.

Comment thread travis/setup_dependencies_common.sh Outdated

for package in matplotlib sphinx; do
# ensure pin file exists before moving it
touch $PIN_FILE

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

It looks like this change means that the pin file isn't always present. Here I'm forcing it to be present. I didn't find anything in the manpage of mv to handle this more gracefully.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I think it would make sense to have this at the top in L85 after the definition of $PIN_FILE

Comment thread travis/setup_dependencies_common.sh Outdated
hash -r

set -e
set -ex

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll remove this again once you give me the OK to handle the PIN_FILE move below like I did.

@bsipocz bsipocz left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Could you please remove the last 4 commits here? Then you need to also update the test file around here: https://github.com/astropy/ci-helpers/blob/master/test_env.py#L12

@kain88-de

Copy link
Copy Markdown
Contributor Author

I already updated the test file.

@bsipocz

bsipocz commented Nov 28, 2017

Copy link
Copy Markdown
Member

Indeed. Thanks.

@bsipocz
bsipocz merged commit 1329842 into astropy:master Nov 29, 2017
@kain88-de
kain88-de deleted the remove-else branch November 29, 2017 13:00
@bsipocz bsipocz mentioned this pull request Nov 30, 2017
kain88-de added a commit to kain88-de/ci-helpers that referenced this pull request Jan 11, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants