Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
damianavila committed Aug 21, 2013
1 parent b4e6e52 commit fd5eea5
Show file tree
Hide file tree
Showing 47 changed files with 108 additions and 44 deletions.
Binary file modified .doit.db
Binary file not shown.
8 changes: 8 additions & 0 deletions cache/posts/one-line-deployment-of-your-site-to-gh-pages.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,12 @@
<p>If you are using <strong>Nikola</strong>, you can add some of this lines to the <code>DEPLOY_COMMANDS</code> in your conf.py file and just run <code>nikola deploy</code> after building your site/blog.</p>
<p>More easier... impossible... ;-)</p>
<p>Damián.</p>
<p><strong>UPDATE</strong>: Not enought happy with step 3 and 4 (esentially because of some <code>git</code> errors), I figured out a cleaner solution:</p>
<p>New 3. Now, we will use a <strong>git-subtree</strong> technique to push the <code>build</code> or <code>output</code> content to the <code>gh-pages</code> branch. You will need to run the following lines every time you want to update your site/blog!</p>
<ul>
<li><code>git checkout master</code> # you can avoid this line if you are in master...</li>
<li><code>git subtree split --prefix output -b gh-pages</code> # create a local gh-pages branch containing the splitted output folder</li>
<li><code>git push -f origin gh-pages:gh-pages</code> # force the push of the gh-pages branch to the remote gh-pages branch at origin</li>
<li><code>git branch -D gh-pages</code> # delete the local gh-pages because you will need it: <a href="https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt#L203">ref</a></li>
</ul>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,12 @@
<p>If you are using <strong>Nikola</strong>, you can add some of this lines to the <code>DEPLOY_COMMANDS</code> in your conf.py file and just run <code>nikola deploy</code> after building your site/blog.</p>
<p>More easier... impossible... ;-)</p>
<p>Damián.</p>
<p><strong>UPDATE</strong>: Not enought happy with step 3 and 4 (esentially because of some <code>git</code> errors), I figured out a cleaner solution:</p>
<p>New 3. Now, we will use a <strong>git-subtree</strong> technique to push the <code>build</code> or <code>output</code> content to the <code>gh-pages</code> branch. You will need to run the following lines every time you want to update your site/blog!</p>
<ul>
<li><code>git checkout master</code> # you can avoid this line if you are in master...</li>
<li><code>git subtree split --prefix output -b gh-pages</code> # create a local gh-pages branch containing the splitted output folder</li>
<li><code>git push -f origin gh-pages:gh-pages</code> # force the push of the gh-pages branch to the remote gh-pages branch at origin</li>
<li><code>git branch -D gh-pages</code> # delete the local gh-pages because you will need it: <a href="https://github.com/git/git/blob/master/contrib/subtree/git-subtree.txt#L203">ref</a></li>
</ul>
</div>
2 changes: 1 addition & 1 deletion output/categories/blog.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (blog)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (blog)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:16 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Do you want to &lt;strong&gt;easily&lt;/strong&gt; deploy your site to Github pages?&lt;/p&gt;
&lt;p&gt;OK, here we go...&lt;/p&gt;
&lt;ol style="list-style-type: decimal"&gt;&lt;li&gt;&lt;p&gt;You have to upload your complete blog/site to a new Github repository (you know how to do it... if not, probably you need to learn some things before try this one, hehe). As a plus, now your blog/site is version-controlled!&lt;/p&gt;&lt;/li&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/facundo.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (Facundo)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:52 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (Facundo)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Han pasado casi tres semanas... El 2 de abril cayeron sobre la ciudad de La Plata casi 400 mm de agua en 24 hs, concentrándose la mayor parte de dicho caudal en dos o tres horas por la tarde, lo que dio lugar a la más grande inundación que la ciudad haya registrado en toda su historia.&lt;/p&gt;
&lt;/div&gt;
&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/family.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (family)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (family)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:17 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Han pasado casi tres semanas... El 2 de abril cayeron sobre la ciudad de La Plata casi 400 mm de agua en 24 hs, concentrándose la mayor parte de dicho caudal en dos o tres horas por la tarde, lo que dio lugar a la más grande inundación que la ciudad haya registrado en toda su historia.&lt;/p&gt;
&lt;/div&gt;
&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/first_post.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (first_post)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:52 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Hello World! Again...</title><link>http://www.damian.oquanta.info/posts/hello-world-again.html</link><description>&lt;p&gt;You know that I have attempted to run a blog before. This is a new attempt...
<rss version="2.0"><channel><title>Damian's blog (first_post)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:17 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Hello World! Again...</title><link>http://www.damian.oquanta.info/posts/hello-world-again.html</link><description>&lt;p&gt;You know that I have attempted to run a blog before. This is a new attempt...
OK, I do not promise to post everyday... but if you have patience,
you will read a lot of interesting things (at least interesting for me).&lt;/p&gt;
&lt;p&gt;See you soon!&lt;/p&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/flood.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (flood)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (flood)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Han pasado casi tres semanas... El 2 de abril cayeron sobre la ciudad de La Plata casi 400 mm de agua en 24 hs, concentrándose la mayor parte de dicho caudal en dos o tres horas por la tarde, lo que dio lugar a la más grande inundación que la ciudad haya registrado en toda su historia.&lt;/p&gt;
&lt;/div&gt;
&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/gh-pages.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (gh-pages)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (gh-pages)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Do you want to &lt;strong&gt;easily&lt;/strong&gt; deploy your site to Github pages?&lt;/p&gt;
&lt;p&gt;OK, here we go...&lt;/p&gt;
&lt;ol style="list-style-type: decimal"&gt;&lt;li&gt;&lt;p&gt;You have to upload your complete blog/site to a new Github repository (you know how to do it... if not, probably you need to learn some things before try this one, hehe). As a plus, now your blog/site is version-controlled!&lt;/p&gt;&lt;/li&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/git.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (git)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:52 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (git)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>One line deployment of your site to gh-pages</title><link>http://www.damian.oquanta.info/posts/one-line-deployment-of-your-site-to-gh-pages.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Do you want to &lt;strong&gt;easily&lt;/strong&gt; deploy your site to Github pages?&lt;/p&gt;
&lt;p&gt;OK, here we go...&lt;/p&gt;
&lt;ol style="list-style-type: decimal"&gt;&lt;li&gt;&lt;p&gt;You have to upload your complete blog/site to a new Github repository (you know how to do it... if not, probably you need to learn some things before try this one, hehe). As a plus, now your blog/site is version-controlled!&lt;/p&gt;&lt;/li&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/ipython.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (IPython)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>IPython plugin for Nikola updated</title><link>http://www.damian.oquanta.info/posts/ipython-plugin-for-nikola-updated.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (IPython)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:17 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>IPython plugin for Nikola updated</title><link>http://www.damian.oquanta.info/posts/ipython-plugin-for-nikola-updated.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;&lt;strong&gt;I am pleased to announce the new version of the IPython plugin for Nikola.&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;This new version has been incorporated into Nikola master a few weeks ago, so it is now available in the last release of &lt;strong&gt;Nikola, 5.5.1.&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;Now that &lt;strong&gt;IPython&lt;/strong&gt; has achieved the &lt;strong&gt;1.0 release&lt;/strong&gt;, and with the incorporation of nbconvert as a part of the IPython machinery, the IPython plugin no longer needs to use a customized version of the old nbconvert, instead it is now using the the power of the new &lt;strong&gt;IPython.nbconvert&lt;/strong&gt; infrastructure to export the ipynb files to HTML pieces to be rendered by &lt;strong&gt;Nikola&lt;/strong&gt;.&lt;/p&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/life.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (life)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:51 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (life)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>Under the Sea... en La Plata</title><link>http://www.damian.oquanta.info/posts/under-the-sea-en-la-plata.html</link><description>&lt;div&gt;&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;Han pasado casi tres semanas... El 2 de abril cayeron sobre la ciudad de La Plata casi 400 mm de agua en 24 hs, concentrándose la mayor parte de dicho caudal en dos o tres horas por la tarde, lo que dio lugar a la más grande inundación que la ciudad haya registrado en toda su historia.&lt;/p&gt;
&lt;/div&gt;
&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
Expand Down
2 changes: 1 addition & 1 deletion output/categories/nbconvert.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0"><channel><title>Damian's blog (nbconvert)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 17:25:52 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>IPython plugin for Nikola updated</title><link>http://www.damian.oquanta.info/posts/ipython-plugin-for-nikola-updated.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
<rss version="2.0"><channel><title>Damian's blog (nbconvert)</title><link>http://www.damian.oquanta.info</link><description>My place to share some thoughts with the world.</description><lastBuildDate>Wed, 21 Aug 2013 18:51:18 GMT</lastBuildDate><generator>nikola</generator><docs>http://blogs.law.harvard.edu/tech/rss</docs><item><title>IPython plugin for Nikola updated</title><link>http://www.damian.oquanta.info/posts/ipython-plugin-for-nikola-updated.html</link><description>&lt;div class="text_cell_render border-box-sizing rendered_html"&gt;
&lt;p&gt;&lt;strong&gt;I am pleased to announce the new version of the IPython plugin for Nikola.&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;This new version has been incorporated into Nikola master a few weeks ago, so it is now available in the last release of &lt;strong&gt;Nikola, 5.5.1.&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;Now that &lt;strong&gt;IPython&lt;/strong&gt; has achieved the &lt;strong&gt;1.0 release&lt;/strong&gt;, and with the incorporation of nbconvert as a part of the IPython machinery, the IPython plugin no longer needs to use a customized version of the old nbconvert, instead it is now using the the power of the new &lt;strong&gt;IPython.nbconvert&lt;/strong&gt; infrastructure to export the ipynb files to HTML pieces to be rendered by &lt;strong&gt;Nikola&lt;/strong&gt;.&lt;/p&gt;
Expand Down
Loading

0 comments on commit fd5eea5

Please sign in to comment.