Skip to content

Travis cleanup pip commands#3227

Merged
stefanv merged 7 commits intoscikit-image:masterfrom
hmaarrfk:travis_cleanup_pip
Jun 28, 2018
Merged

Travis cleanup pip commands#3227
stefanv merged 7 commits intoscikit-image:masterfrom
hmaarrfk:travis_cleanup_pip

Conversation

@hmaarrfk
Copy link
Copy Markdown
Member

@hmaarrfk hmaarrfk commented Jun 27, 2018

Description

Travis build scripts had a few pip commands that were sprinkled inside the before_install.sh.
This caused version numbers to have to be updated in yet an other location.
This removes these random occurrences.

In doing so:

  1. Versions will respect those in the requirements folder.
  2. the --pre build now pulls in the numpy pre release (which as of time of writing, fails tests)
  3. Minimum version requirements can also be set for testing and building tools

For reviewers

(Don't remove the checklist below.)

  • Check that the PR title is short, concise, and will make sense 1 year
    later.
  • Check that new functions are imported in corresponding __init__.py.
  • Check that new features, API changes, and deprecations are mentioned in
    doc/release/release_dev.rst.
  • Consider backporting the PR with @meeseeksdev backport to v0.14.x

@hmaarrfk hmaarrfk mentioned this pull request Jun 27, 2018
Closed
@hmaarrfk
Copy link
Copy Markdown
Member Author

hmaarrfk commented Jun 27, 2018

@matthew-brett This PR is much more tame. and I think it is genuinely a step in the forward direction. (as opposed to the other PR that included some sideways backward steps)

jni
jni approved these changes Jun 28, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@jni jni left a comment

Choose a reason for hiding this comment

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

I didn't follow the logic carefully but basically LGTM. ;)

@stefanv
Copy link
Copy Markdown
Member

stefanv commented Jun 28, 2018

I'm glad to be rid of the manually specified version of Cython and numpydoc. Thanks!

@stefanv stefanv merged commit f21c52b into scikit-image:master Jun 28, 2018
@hmaarrfk hmaarrfk mentioned this pull request Jun 28, 2018
Closed
15 tasks
@hmaarrfk hmaarrfk deleted the travis_cleanup_pip branch June 28, 2018 05:03
@sciunto
Copy link
Copy Markdown
Member

sciunto commented Nov 17, 2018

@meeseeksdev backport to v0.14.x

@lumberbot-app
Copy link
Copy Markdown

lumberbot-app bot commented Nov 17, 2018

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout v0.14.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 f21c52bc248b59197129d60b97285e1579fee6bf
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #3227: Travis cleanup pip commands'
  1. Push to a named branch :
git push YOURFORK v0.14.x:auto-backport-of-pr-3227-on-v0.14.x
  1. Create a PR against branch v0.14.x, I would have named this PR:

"Backport PR #3227 on branch v0.14.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

@lumberbot-app lumberbot-app bot added the Still Needs Manual Backport MrMeeseeks-managed label label Nov 17, 2018
@sciunto sciunto mentioned this pull request Nov 17, 2018
Merged
sciunto pushed a commit to sciunto/scikit-image that referenced this pull request Nov 17, 2018
@stefanv @sciunto
Merge pull request scikit-image#3227 from hmaarrfk/travis_cleanup_pip
fe1693b 
Travis-CI: cleanup pip commands
sciunto pushed a commit that referenced this pull request Nov 19, 2018
@stefanv @sciunto
Merge pull request #3227 from hmaarrfk/travis_cleanup_pip
7a2ddb0 
Travis-CI: cleanup pip commands
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jni jni jni approved these changes

Assignees

No one assigned

Labels

Still Needs Manual Backport MrMeeseeks-managed label

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@hmaarrfk @stefanv @sciunto @jni