Merge pull request python3statement#12 from jairideout/add-skbio

Carreau · Carreau · commit 14674311f994 · 2016-05-13T16:09:21.000-07:00
Add scikit-bio and related Caporaso Lab projects to list/timeline
diff --git a/README.md b/README.md
@@ -1,44 +1,39 @@
-# A Plege to migrate to Python 3. 
+# A pledge to migrate to Python 3.
 
-This is the main website for a pledge to stop supporting Python 2 for free in open source software. 
+This is the main website for a pledge to stop supporting Python 2 for free in
+open source software.
 
-# run locally
+# Run locally
 
-Install Jekyll : `gem install jekyll`, `gem install gh-pages`
+Install Jekyll : `gem install jekyll`, `gem install github-pages`
 
 Clone this locally, `cd` in the newly created directory.
 
-run `jekyll serve -w` in one terminal, open you browse to `localhost:4000`.
+Run `jekyll serve -w` in one terminal, open your browser to `localhost:4000`.
 
-Modify the various files, refresh your browser and enjoy. 
+Modify the various files, refresh your browser and enjoy.
 
 PRs welcomed.
 
 # Add your project
 
-If you just want to add you project to the list of participating project, add a
-line in [the list of participating project](_sections/30-projects.md), it's
+If you just want to add your project to the list of participating projects, add
+a line in [the list of participating projects](_sections/30-projects.md). It's
 markdown so feel free to just list your project name or add a link, and make a
 pull request. You should even be able to [edit it
 online](https://github.com/python3statement/python3statement.github.io/edit/master/_sections/30-projects.md).
 
+## Add timeline information
 
-
-
-## Add timeline informations
-
-The front page also have a timeline chart, with past release dates, and future
-(planned) releases. You can also add you project there, if you have a specific
-date where you plan to drop Python 2 support. 
+The front page also has a timeline chart, with past release dates and future
+(planned) releases. You can also add your project there, if you have a specific
+date where you plan to drop Python 2 support.
 
 See [site.js](site.js) around [line
 100](https://github.com/python3statement/python3statement.github.io/blob/master/site.js#L103)
-to see how to add this kind of data. 
-
-
-# Base template:
-
-This is a based on version of
-[github.com/t413/SinglePaged](https://github.com/t413/SinglePaged)
+to see how to add this kind of data.
 
+# Base template
 
+This site is based on
+[github.com/t413/SinglePaged](https://github.com/t413/SinglePaged).
diff --git a/_sections/30-projects.md b/_sections/30-projects.md
@@ -9,6 +9,8 @@ style: center
 # Participating Projects
 
 - [IPython](https://ipython.org)
-- [Jupyter notebook](https://jupyter.org) 
-
-
+- [Jupyter notebook](https://jupyter.org)
+- [scikit-bio](http://scikit-bio.org)
+- [An Introduction to Applied Bioinformatics](http://readiab.org)
+- [QIIME](http://qiime.org)
+- [cual-id](https://github.com/johnchase/cual-id)
diff --git a/_sections/40-timeline.md b/_sections/40-timeline.md
@@ -15,4 +15,4 @@ extended support. (Python's own timeline is available
 
 <div id="visualization"></div>
 
-See how to [add  your project to the list of participating project](https://github.com/python3statement/python3statement.github.io#add-your-project) and to [this timeline](https://github.com/python3statement/python3statement.github.io#add-timeline-informations)
+See how to [add  your project to the list of participating projects](https://github.com/python3statement/python3statement.github.io#add-your-project) and to [this timeline](https://github.com/python3statement/python3statement.github.io#add-timeline-information)
diff --git a/_sections/50-why.md b/_sections/50-why.md
@@ -15,4 +15,4 @@ code to use Python 3:
 - [How to add Python 3 support to your code](https://docs.python.org/3/howto/pyporting.html)
 - [Stop supporting Python 2.6 for free](http://www.curiousefficiency.org/posts/2015/04/stop-supporting-python26.html) (Nick Coghlan)
 - [Why Python 4.0 won't be like Python 3.0](http://www.curiousefficiency.org/posts/2014/08/python-4000.html) (Nick Coghlan)
-- [SciKitBio Py3 Only RFC](https://github.com/biocore/scikit-bio-rfcs/blob/master/active/002-py3-only.md)
+- [scikit-bio py3-only RFC](https://github.com/biocore/scikit-bio-rfcs/blob/master/accepted/002-py3-only.md)
diff --git a/site.js b/site.js
@@ -119,6 +119,14 @@ $(document).ready(function (){
       {content: '7.x', start: '2018-01-01', end:'2019-06-12'},
       {content: '8.x', start: '2019-06-12', end:'2020-06-01'},
     ],
+    'scikit-bio':[
+      {content: '0.1.1 - 0.4.2', start: '2014-05-16', end: '2016-05-30', py2:true},
+      {content: '0.5.0+', start: '2016-05-31', end: '2021-12-16'},
+    ],
+    'QIIME':[
+      {content: '1.x', start: '2010-04-09', end: '2017-12-31', py2:true},
+      {content: '2.x+', start: '2016-07-11', end: '2021-12-16'},
+    ],
     // for tests, rando example
     //'matplotlib':[
     //  {content: 'matplotlib 2.x', start: '2015-06-01', end:'2018-06-01', py2:true},
@@ -129,7 +137,7 @@ $(document).ready(function (){
     //  {content: '0.19', start: '2016-11-02', end:'2017-12-01'},
     //]
 
-  
+
   }
 
   // Create a DataSet (allows two way data-binding)
@@ -159,7 +167,7 @@ $(document).ready(function (){
 
   var options = {
     clickToUse: true,
-    groupOrder: 'group'  
+    groupOrder: 'group'
   };
 
   // Create a Timeline
@@ -169,4 +177,3 @@ $(document).ready(function (){
   timeline.addCustomTime(Date.parse('2020-01-01'))
 
 });
-

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,4 @@ extended support. (Python's own timeline is available`
`15`	`15`
`16`	`16`	`<div id="visualization"></div>`
`17`	`17`
`18`		`-See how to [add your project to the list of participating project](https://github.com/python3statement/python3statement.github.io#add-your-project) and to [this timeline](https://github.com/python3statement/python3statement.github.io#add-timeline-informations)`
	`18`	`+See how to [add your project to the list of participating projects](https://github.com/python3statement/python3statement.github.io#add-your-project) and to [this timeline](https://github.com/python3statement/python3statement.github.io#add-timeline-information)`