From de3d9d4637552152db94d28e1623ad9f1570bb19 Mon Sep 17 00:00:00 2001 From: Marc Garcia Date: Mon, 23 Sep 2019 19:25:12 +0100 Subject: [PATCH 1/4] More restructuring and styling --- web/pandas/_templates/layout.html | 88 ++++++++++++------- web/pandas/{community => about}/about.md | 0 web/pandas/{community => about}/citing.md | 4 +- web/pandas/{community => about}/roadmap.md | 0 web/pandas/about/sponsors.md | 33 +++++++ web/pandas/{community => about}/team.md | 36 +------- web/pandas/{ => community}/blog.html | 0 web/pandas/community/coc.md | 2 +- web/pandas/community/ecosystem.md | 2 +- web/pandas/config.yml | 53 +++++------ web/pandas/contribute.md | 12 +++ web/pandas/donate.md | 11 --- web/pandas/{install.md => getting_started.md} | 27 +++++- web/pandas/static/css/pandas.css | 40 ++++++++- 14 files changed, 196 insertions(+), 112 deletions(-) rename web/pandas/{community => about}/about.md (100%) rename web/pandas/{community => about}/citing.md (98%) rename web/pandas/{community => about}/roadmap.md (100%) create mode 100644 web/pandas/about/sponsors.md rename web/pandas/{community => about}/team.md (63%) rename web/pandas/{ => community}/blog.html (100%) create mode 100644 web/pandas/contribute.md rename web/pandas/{install.md => getting_started.md} (62%) diff --git a/web/pandas/_templates/layout.html b/web/pandas/_templates/layout.html index 253318182f30c..fe3e4d1245d93 100644 --- a/web/pandas/_templates/layout.html +++ b/web/pandas/_templates/layout.html @@ -20,41 +20,44 @@ {% endfor %} +
@@ -64,11 +67,30 @@ diff --git a/web/pandas/community/about.md b/web/pandas/about/about.md similarity index 100% rename from web/pandas/community/about.md rename to web/pandas/about/about.md diff --git a/web/pandas/community/citing.md b/web/pandas/about/citing.md similarity index 98% rename from web/pandas/community/citing.md rename to web/pandas/about/citing.md index 6bad948bb3736..77b79c41aa4d1 100644 --- a/web/pandas/community/citing.md +++ b/web/pandas/about/citing.md @@ -1,6 +1,6 @@ -# Citing pandas +# Citing and logo -## Citing +## Citing pandas If you use _pandas_ for a scientific publication, we would appreciate citations to one of the following papers: diff --git a/web/pandas/community/roadmap.md b/web/pandas/about/roadmap.md similarity index 100% rename from web/pandas/community/roadmap.md rename to web/pandas/about/roadmap.md diff --git a/web/pandas/about/sponsors.md b/web/pandas/about/sponsors.md new file mode 100644 index 0000000000000..352acf01e9efe --- /dev/null +++ b/web/pandas/about/sponsors.md @@ -0,0 +1,33 @@ +# Sponsors + +## NumFOCUS + +![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png) + +_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States. +NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the +health and sustainability of the project. Visit numfocus.org for more information. + +Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible +to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation. + +## Institutional partners + + + +## In-kind sponsors + +- [OVH](https://us.ovhcloud.com/): Hosting +- [Indeed](https://opensource.indeedeng.io/): Logo and website design + +## Past institutional partners + + diff --git a/web/pandas/community/team.md b/web/pandas/about/team.md similarity index 63% rename from web/pandas/community/team.md rename to web/pandas/about/team.md index c0a15081e1fa8..41da3a0e82bdb 100644 --- a/web/pandas/community/team.md +++ b/web/pandas/about/team.md @@ -36,25 +36,12 @@ If you want to support pandas development, you can find information in the [dona {% endfor %} -## BDFL +## Governance Wes McKinney is the Benevolent Dictator for Life (BDFL). -## Governance - The project governance is available in the [project governance documents](https://github.com/pandas-dev/pandas-governance). -## NumFOCUS - -![](https://numfocus.org/wp-content/uploads/2018/01/optNumFocus_LRG.png) - -_pandas_ is a Sponsored Project of [NumFOCUS](https://numfocus.org/), a 501(c)(3) nonprofit charity in the United States. -NumFOCUS provides _pandas_ with fiscal, legal, and administrative support to help ensure the -health and sustainability of the project. Visit numfocus.org for more information. - -Donations to _pandas_ are managed by NumFOCUS. For donors in the United States, your gift is tax-deductible -to the extent provided by law. As with any donation, you should consult with your tax adviser about your particular tax situation. - ## Code of conduct committee -## Institutional partners - - - -In-kind sponsors - -- [Indeed](https://opensource.indeedeng.io/): Logo and website design -- Can we find a donor for the hosting (website, benchmarks,...?) - ## Emeritus maintainers - -## Past institutional partners - - diff --git a/web/pandas/blog.html b/web/pandas/community/blog.html similarity index 100% rename from web/pandas/blog.html rename to web/pandas/community/blog.html diff --git a/web/pandas/community/coc.md b/web/pandas/community/coc.md index 2841349fdb556..de0e8120f7eee 100644 --- a/web/pandas/community/coc.md +++ b/web/pandas/community/coc.md @@ -1,4 +1,4 @@ -# Contributor Code of Conduct +# Code of conduct As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who diff --git a/web/pandas/community/ecosystem.md b/web/pandas/community/ecosystem.md index af27c31b52d50..cf242e86f879f 100644 --- a/web/pandas/community/ecosystem.md +++ b/web/pandas/community/ecosystem.md @@ -1,4 +1,4 @@ -# Pandas ecosystem +# Ecosystem Increasingly, packages are being built on top of pandas to address specific needs in data preparation, analysis and visualization. This is diff --git a/web/pandas/config.yml b/web/pandas/config.yml index c7c4b77e309f7..e98dfcd01b72d 100644 --- a/web/pandas/config.yml +++ b/web/pandas/config.yml @@ -4,12 +4,11 @@ main: ignore: - _templates/layout.html - config.yml - - blog.html # blog will be added at a later stage - try.md # the binder page will be added later github_repo_url: pandas-dev/pandas context_preprocessors: - pandas_web.Preprocessors.navbar_add_info - # - pandas_web.Preprocessors.blog_add_posts + - pandas_web.Preprocessors.blog_add_posts - pandas_web.Preprocessors.maintainers_add_info - pandas_web.Preprocessors.home_add_releases markdown_extensions: @@ -17,46 +16,48 @@ main: - tables - fenced_code static: - logo: # path to the logo when it's in the repo + logo: # /static/img/pandas.svg css: - /static/css/pandas.css navbar: - - name: "Install" - target: /install.html + - name: "About us" + target: + - name: "About pandas" + target: /about/about.html + - name: "Project roadmap" + target: /about/roadmap.html + - name: "Team" + target: /about/team.html + - name: "Sponsors" + target: /about/sponsors.html + - name: "Citing and logo" + target: /about/citing.html + - name: "Getting started" + target: /getting_started.html - name: "Documentation" target: - - name: "Getting started" - target: /docs/getting_started/index.html - name: "User guide" target: /docs/user_guide/index.html - name: "API reference" target: /docs/reference/index.html - - name: "Contributing to pandas" - target: /docs/development/index.html - name: "Release notes" target: /docs/whatsnew/index.html + - name: "Older versions" + target: https://pandas.pydata.org/pandas-docs/version/ - name: "Community" target: - - name: "About pandas" - target: /community/about.html - - name: "Project roadmap" - target: /community/roadmap.html - - name: "Ecosystem" - target: /community/ecosystem.html + - name: "Blog" + target: /community/blog.html - name: "Ask a question (StackOverflow)" target: https://stackoverflow.com/questions/tagged/pandas - - name: "Discuss (mailing list)" - target: https://groups.google.com/forum/#!forum/pydata - - name: "Team" - target: /community/team.html - - name: "Code of Conduct" + - name: "Discuss" + target: https://pandas.discourse.group + - name: "Code of conduct" target: /community/coc.html - - name: "Citing pandas" - target: /community/citing.html - # - name: "Blog" - # target: /blog.html - - name: "Donate" - target: /donate.html + - name: "Ecosystem" + target: /community/ecosystem.html + - name: "Contribute" + target: /contribute.html blog: num_posts: 8 feed: diff --git a/web/pandas/contribute.md b/web/pandas/contribute.md new file mode 100644 index 0000000000000..6d8fb9e224fe1 --- /dev/null +++ b/web/pandas/contribute.md @@ -0,0 +1,12 @@ +# Contribute to pandas + +_pandas_ is and always will be **free**. To make de development sustainable, we need _pandas_ users, corporate +or individual, to support the development by providing their time and money. + +You can find more information about current developers in the [team page](about/team.html), +and about current sponsors in the [sponsors page](about/sponsors.html). +Financial contributions will mainly be used to advance in the [pandas roadmap](about/roadmap.html). + +- If your **company or organization** is interested in helping make pandas better, please contact us at [info@numfocus.org](mailto:info@numfocus.org) +- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html) +- If you want to support _pandas_ with a **donation**, please use the [donations page](donate.html). diff --git a/web/pandas/donate.md b/web/pandas/donate.md index 5f5b07fb8763c..69db7e4648e77 100644 --- a/web/pandas/donate.md +++ b/web/pandas/donate.md @@ -1,16 +1,5 @@ # Donate to pandas -_pandas_ is and always will be **free**. To make de development sustainable, we need _pandas_ users, corporate -or individual, to support the development by providing their time and money. - -You can find more information about current developers and supporters in the [team page](community/team.html). -Financial contributions will mainly be used to advance in the [pandas roadmap](community/roadmap.html). - -- If your **company or organization** is interested in helping make pandas better, please contact us at [info@numfocus.org](mailto:info@numfocus.org) -- If you want to contribute to _pandas_ with your **time**, please visit the [contributing page]({{ base_url }}/docs/development/index.html) -- If you want to support _pandas_ with a **donation**, please use the form below: - -