diff --git a/.travis.yml b/.travis.yml index c1c9f1300..7fc3c60ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,4 +3,5 @@ # See https://help.github.com/articles/troubleshooting-github-pages-build-failures/ language: ruby +rvm: 2.1.1 script: "bundle exec jekyll build" diff --git a/Gemfile b/Gemfile index 053c27dc3..7cd07ddc1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org/' gem 'github-pages' +gem 'jekyll-redirect-from' diff --git a/README.md b/README.md index bc3cceafe..514876214 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,14 @@ --- +title: README --- This is an attempt to automatically convert a Mediawiki XML export -from http://biopthon.org into markdown (using pandoc) as a git +from into markdown (using pandoc) as a git repository to be hosted using GitHub Pages (rendered using Jekyll). -https://help.github.com/articles/using-jekyll-with-pages/ + The conversion is via a Python script (calling pandoc and git), see: -https://github.com/peterjc/mediawiki_to_git_md + I'm using a manually compiled table mapping MediaWiki usernames to GitHub accounts - if I have mis-identified you, please email @@ -15,4 +16,13 @@ me during this testing period and I'll remove the false mapping. I failed to match about 20 accounts on the wiki (mostly single contributions). -This site ought to be viewable via https://peterjc.github.io/README.html +This site ought to be viewable via +and this page as *html* at +and +in the original source *markdown* view on GitHub. + +Branches: GitHub pages will automatically show the ``master`` branch +on which I am therefore using for live +testing of the automated imports. This means I will regularly +re-write git history with replacement ``master`` branches. +Each time I will return to the ``pre_auto_import`` branch. diff --git a/SRC/index.md b/SRC/index.md new file mode 100644 index 000000000..0cf33ff1c --- /dev/null +++ b/SRC/index.md @@ -0,0 +1,8 @@ +--- +title: Biopython Source Code - Redirection +--- + +We originally used to hold a complete +snapshot of the latest Biopython source code, but you can now +browse this online at GitHub, and directly download individual +files via the raw links: diff --git a/_config.yml b/_config.yml new file mode 100644 index 000000000..073af01d0 --- /dev/null +++ b/_config.yml @@ -0,0 +1,21 @@ +# Dependencies +highlighter: rouge +markdown: kramdown +kramdown: + input: GFM + syntax_highlighter: rouge +gems: + - jekyll-redirect-from +whitelist: + - jekyll-redirect-from + +# Setup +baseurl: / + +# Page settings +defaults: + - + scope: + path: "" # an empty string here means all files in the project + values: + layout: "default" diff --git a/_includes/foot.html b/_includes/foot.html new file mode 100644 index 000000000..2ab5c0d1f --- /dev/null +++ b/_includes/foot.html @@ -0,0 +1,2 @@ + + diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 000000000..a1ffa7f5a --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,8 @@ + + + + + {{ page.title }} + + + diff --git a/_layouts/default.html b/_layouts/default.html new file mode 100644 index 000000000..63b624999 --- /dev/null +++ b/_layouts/default.html @@ -0,0 +1,7 @@ +{% include head.html %} + +

{{ page.title }}

+ + {{ content }} + +{% include foot.html %} diff --git a/_layouts/tagpage.html b/_layouts/tagpage.html new file mode 100644 index 000000000..49656fc80 --- /dev/null +++ b/_layouts/tagpage.html @@ -0,0 +1,19 @@ +{% include head.html %} + +

{{ page.title }}

+ + {{ content }} + +
    + {% for p in site.pages %} + {% for tag in p.tags %} + {% if tag == page.tag %} +
  • + {{ p.title }} +
  • + {% endif %} + {% endfor %} + {% endfor %} +
+ +{% include foot.html %} diff --git a/_layouts/wiki.html b/_layouts/wiki.html new file mode 100644 index 000000000..63b624999 --- /dev/null +++ b/_layouts/wiki.html @@ -0,0 +1,7 @@ +{% include head.html %} + +

{{ page.title }}

+ + {{ content }} + +{% include foot.html %} diff --git a/css/syntax.css b/css/syntax.css new file mode 100644 index 000000000..2774b7649 --- /dev/null +++ b/css/syntax.css @@ -0,0 +1,60 @@ +.highlight { background: #ffffff; } +.highlight .c { color: #999988; font-style: italic } /* Comment */ +.highlight .err { color: #a61717; background-color: #e3d2d2 } /* Error */ +.highlight .k { font-weight: bold } /* Keyword */ +.highlight .o { font-weight: bold } /* Operator */ +.highlight .cm { color: #999988; font-style: italic } /* Comment.Multiline */ +.highlight .cp { color: #999999; font-weight: bold } /* Comment.Preproc */ +.highlight .c1 { color: #999988; font-style: italic } /* Comment.Single */ +.highlight .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */ +.highlight .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */ +.highlight .gd .x { color: #000000; background-color: #ffaaaa } /* Generic.Deleted.Specific */ +.highlight .ge { font-style: italic } /* Generic.Emph */ +.highlight .gr { color: #aa0000 } /* Generic.Error */ +.highlight .gh { color: #999999 } /* Generic.Heading */ +.highlight .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */ +.highlight .gi .x { color: #000000; background-color: #aaffaa } /* Generic.Inserted.Specific */ +.highlight .go { color: #888888 } /* Generic.Output */ +.highlight .gp { color: #555555 } /* Generic.Prompt */ +.highlight .gs { font-weight: bold } /* Generic.Strong */ +.highlight .gu { color: #aaaaaa } /* Generic.Subheading */ +.highlight .gt { color: #aa0000 } /* Generic.Traceback */ +.highlight .kc { font-weight: bold } /* Keyword.Constant */ +.highlight .kd { font-weight: bold } /* Keyword.Declaration */ +.highlight .kp { font-weight: bold } /* Keyword.Pseudo */ +.highlight .kr { font-weight: bold } /* Keyword.Reserved */ +.highlight .kt { color: #445588; font-weight: bold } /* Keyword.Type */ +.highlight .m { color: #009999 } /* Literal.Number */ +.highlight .s { color: #d14 } /* Literal.String */ +.highlight .na { color: #008080 } /* Name.Attribute */ +.highlight .nb { color: #0086B3 } /* Name.Builtin */ +.highlight .nc { color: #445588; font-weight: bold } /* Name.Class */ +.highlight .no { color: #008080 } /* Name.Constant */ +.highlight .ni { color: #800080 } /* Name.Entity */ +.highlight .ne { color: #990000; font-weight: bold } /* Name.Exception */ +.highlight .nf { color: #990000; font-weight: bold } /* Name.Function */ +.highlight .nn { color: #555555 } /* Name.Namespace */ +.highlight .nt { color: #000080 } /* Name.Tag */ +.highlight .nv { color: #008080 } /* Name.Variable */ +.highlight .ow { font-weight: bold } /* Operator.Word */ +.highlight .w { color: #bbbbbb } /* Text.Whitespace */ +.highlight .mf { color: #009999 } /* Literal.Number.Float */ +.highlight .mh { color: #009999 } /* Literal.Number.Hex */ +.highlight .mi { color: #009999 } /* Literal.Number.Integer */ +.highlight .mo { color: #009999 } /* Literal.Number.Oct */ +.highlight .sb { color: #d14 } /* Literal.String.Backtick */ +.highlight .sc { color: #d14 } /* Literal.String.Char */ +.highlight .sd { color: #d14 } /* Literal.String.Doc */ +.highlight .s2 { color: #d14 } /* Literal.String.Double */ +.highlight .se { color: #d14 } /* Literal.String.Escape */ +.highlight .sh { color: #d14 } /* Literal.String.Heredoc */ +.highlight .si { color: #d14 } /* Literal.String.Interpol */ +.highlight .sx { color: #d14 } /* Literal.String.Other */ +.highlight .sr { color: #009926 } /* Literal.String.Regex */ +.highlight .s1 { color: #d14 } /* Literal.String.Single */ +.highlight .ss { color: #990073 } /* Literal.String.Symbol */ +.highlight .bp { color: #999999 } /* Name.Builtin.Pseudo */ +.highlight .vc { color: #008080 } /* Name.Variable.Class */ +.highlight .vg { color: #008080 } /* Name.Variable.Global */ +.highlight .vi { color: #008080 } /* Name.Variable.Instance */ +.highlight .il { color: #009999 } /* Literal.Number.Integer.Long */ diff --git a/index.md b/index.md index 2b85cb5d7..f12236807 100644 --- a/index.md +++ b/index.md @@ -1,9 +1,13 @@ --- +title: Placeholder Index Page --- This site is currently being used for a trial migration of the [Biopython wiki pages](http://biopython.org) -using https://github.com/peterjc/mediawiki_to_git_md +using While this will probably eventually be a redirect page, -for now please see the [README]{README.md} file. +for now please see the migration +[README](https://biopython.github.io/README.html) file, +or conversion of the wiki's +[main page](http://biopython.github.io/wiki/Biopython). diff --git a/robots.txt b/robots.txt new file mode 100644 index 000000000..1f53798bb --- /dev/null +++ b/robots.txt @@ -0,0 +1,2 @@ +User-agent: * +Disallow: /