Skip to content

[MRG + 1] Update funding and website. #7836

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

Jump to bottom
Merged
merged 3 commits into from
Nov 7, 2016
Merged

[MRG + 1] Update funding and website. #7836

merged 3 commits into from
Nov 7, 2016

Conversation

tguillemot
Copy link
Contributor

This PR update the funding section and add some links to the images of the section.

@GaelVaroquaux
Copy link
Member

+1. Thanks

GaelVaroquaux
GaelVaroquaux reviewed Nov 7, 2016
View reviewed changes
doc/about.rst
Tom Dupré la Tour (2015), Thierry Guillemot (2016) and Raghav R V (2016) to
work on scikit-learn.

.. image:: http://f.hypotheses.org/wp-content/blogs.dir/331/files/2011/03/Logo-TPT.jpg
Copy link
Member

Choose a reason for hiding this comment

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

It might be good to add this image to our git. I worry that the URL given here will not last forever.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good point.

@tguillemot
Copy link
Contributor Author

BTW, I have just updated people from Télécom but if you think about someone else, I can add them ;).

GaelVaroquaux
GaelVaroquaux approved these changes Nov 7, 2016
View reviewed changes
Copy link
Member

@GaelVaroquaux GaelVaroquaux left a comment

Choose a reason for hiding this comment

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

LGTM. 👍 to merge

GaelVaroquaux
GaelVaroquaux requested changes Nov 7, 2016
View reviewed changes
Copy link
Member

@GaelVaroquaux GaelVaroquaux left a comment

Choose a reason for hiding this comment

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

Actually, circleCI doesn't build, and the reason is that the image file of telecom seems not to be reachable.

raghavrv
raghavrv suggested changes Nov 7, 2016
View reviewed changes
doc/about.rst
:target: http://cds.nyu.edu/mooresloan/

`Télécom Paristech <http://www.telecom-paristech.com>`_ funds Manoj Kumar (2014),
Tom Dupré la Tour (2015), Thierry Guillemot (2016) and Raghav R V (2016) to
Copy link
Member

Choose a reason for hiding this comment

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

I think mine should be 2015 to current as I started in Oct 2015...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I correct that.

doc/about.rst
Tom Dupré la Tour (2015), Thierry Guillemot (2016) and Raghav R V (2016) to
work on scikit-learn.

.. image:: _static/img/telecom.png
Copy link
Member

Choose a reason for hiding this comment

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

And like @GaelVaroquaux points out, this file is missing?

Copy link
Contributor Author

@tguillemot tguillemot Nov 7, 2016 •
edited
Loading

Choose a reason for hiding this comment

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

It's my fault indeed. This file is generated automatically with sphinx but it doesn't exist before the check is complete.

@raghavrv raghavrv added this to the 0.18.1 milestone Nov 7, 2016
raghavrv
raghavrv reviewed Nov 7, 2016
View reviewed changes
doc/about.rst
:target: http://cds.nyu.edu/mooresloan/

`Télécom Paristech <http://www.telecom-paristech.com>`_ funds Manoj Kumar (2014),
Tom Dupré la Tour (2015), Raghav R V (2015-2016) Thierry Guillemot (2016) and to
Copy link
Member

Choose a reason for hiding this comment

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

A missing comma? :P

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry I'm doing two things in the same time. Bad habits :)

@tguillemot tguillemot changed the title Update funding and website. [MRG + 2] Update funding and website. Nov 7, 2016
@tguillemot tguillemot changed the title [MRG + 2] Update funding and website. [MRG + 1] Update funding and website. Nov 7, 2016
@raghavrv
Copy link
Member

raghavrv commented Nov 7, 2016

LGTM. @GaelVaroquaux +1 and merge once the CIs pass?

@GaelVaroquaux
Copy link
Member

Once CI passes yes

⁣Sent from my phone. Please forgive brevity and mis spelling​

On Nov 7, 2016, 17:17, at 17:17, Raghav RV notifications@github.com wrote:

LGTM. @GaelVaroquaux +1 and merge once the CIs pass?

You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub:
#7836 (comment)

@raghavrv raghavrv merged commit 4502520 into scikit-learn:master Nov 7, 2016
@raghavrv
Copy link
Member

raghavrv commented Nov 7, 2016

Thanks @tguillemot

amueller pushed a commit to amueller/scikit-learn that referenced this pull request Nov 9, 2016
@tguillemot @amueller
[MRG + 1] Update funding and website. (scikit-learn#7836)
d104a66 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
sergeyf pushed a commit to sergeyf/scikit-learn that referenced this pull request Feb 28, 2017
@tguillemot @sergeyf
[MRG + 1] Update funding and website. (scikit-learn#7836)
3d8a642 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
Sundrique pushed a commit to Sundrique/scikit-learn that referenced this pull request Jun 14, 2017
@tguillemot @Sundrique
[MRG + 1] Update funding and website. (scikit-learn#7836)
9d1bd76 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
NelleV pushed a commit to NelleV/scikit-learn that referenced this pull request Aug 11, 2017
@tguillemot @NelleV
[MRG + 1] Update funding and website. (scikit-learn#7836)
38e11aa 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
paulha pushed a commit to paulha/scikit-learn that referenced this pull request Aug 19, 2017
@tguillemot @paulha
[MRG + 1] Update funding and website. (scikit-learn#7836)
33fe4b6 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
maskani-moh pushed a commit to maskani-moh/scikit-learn that referenced this pull request Nov 15, 2017
@tguillemot @maskani-moh
[MRG + 1] Update funding and website. (scikit-learn#7836)
fe40dcc 
* Fix funding and website.

* Update images and fix typos.

* Fix images problem.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GaelVaroquaux GaelVaroquaux GaelVaroquaux requested changes

@raghavrv raghavrv raghavrv approved these changes

Assignees
No one assigned
Labels
Documentation
Projects
None yet
Milestone
0.18.1
Development

Successfully merging this pull request may close these issues.
3 participants
@tguillemot @GaelVaroquaux @raghavrv