Skip to content

Commit 4435dac

Browse files
mattmakaimattmakai
committed
moving what section next blocks to templates
1 parent e5db179 commit 4435dac

File tree

10 files changed

+151
-109
lines changed

10 files changed

+151
-109
lines changed

‎all.html‎

Lines changed: 57 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,7 +2808,6 @@ <h3>General Python data resources</h3>
28082808
in scientific fields.</p>
28092809
</li>
28102810
</ul>
2811-
<h3>What else would you like to learn about Python and data?</h3>
28122811
<h1>Databases</h1>
28132812
<p>A database is an abstraction on top of an operating system's file system to
28142813
ease creating, reading, updating, and deleting persistent data. </p>
@@ -3020,24 +3019,32 @@ <h2>Database resources</h2>
30203019
</li>
30213020
</ul>
30223021
<h2>Databases learning checklist</h2>
3023-
<p><i class="fa fa-check-square-o"></i>
3024-
Install PostgreSQL on your server. Assuming you went with Ubuntu run
3025-
<code>sudo apt-get install postgresql</code>.</p>
3026-
<p><i class="fa fa-check-square-o"></i>
3027-
Make sure the <a href="http://initd.org/psycopg/">psycopg2</a> library is part of your
3028-
application dependencies.</p>
3029-
<p><i class="fa fa-check-square-o"></i>
3030-
Configure your web application to connect to the PostgreSQL instance.</p>
3031-
<p><i class="fa fa-check-square-o"></i>
3032-
Create models in your ORM, either with Django's
3033-
<a href="https://docs.djangoproject.com/en/dev/topics/db/">built-in ORM</a> or
3034-
<a href="http://www.sqlalchemy.org/">SQLAlchemy with Flask</a>. </p>
3035-
<p><i class="fa fa-check-square-o"></i>
3036-
Sync the ORM models with the PostgreSQL instance.</p>
3037-
<p><i class="fa fa-check-square-o"></i>
3038-
Start creating, reading, updating and deleting data in the database from your
3039-
web application.</p>
3040-
<h3>What's next to get your app running?</h3>
3022+
<ol>
3023+
<li>
3024+
<p>Install PostgreSQL on your server. Assuming you went with Ubuntu run
3025+
<code>sudo apt-get install postgresql</code>.</p>
3026+
</li>
3027+
<li>
3028+
<p>Make sure the <a href="http://initd.org/psycopg/">psycopg2</a> library is in your
3029+
application's dependencies.</p>
3030+
</li>
3031+
<li>
3032+
<p>Configure your web application to connect to the PostgreSQL instance.</p>
3033+
</li>
3034+
<li>
3035+
<p>Create models in your ORM, either with Django's
3036+
<a href="https://docs.djangoproject.com/en/dev/topics/db/">built-in ORM</a> or
3037+
<a href="http://www.sqlalchemy.org/">SQLAlchemy with Flask</a>. </p>
3038+
</li>
3039+
<li>
3040+
<p>Build your database tables or sync the ORM models with the PostgreSQL
3041+
instance, if you're using an ORM.</p>
3042+
</li>
3043+
<li>
3044+
<p>Start creating, reading, updating and deleting data in the database
3045+
from your web application.</p>
3046+
</li>
3047+
</ol>
30413048
<h1>NoSQL Data Stores</h1>
30423049
<p>Relational databases store the vast majority of web application
30433050
persistent data. However, there are several alternative classifications of
@@ -3058,16 +3065,26 @@ <h2>Key-value Pair</h2>
30583065
on <a href="http://en.wikipedia.org/wiki/Hash_table">hash map</a> data structures.</p>
30593066
<h3>Key-value pair data stores</h3>
30603067
<ul>
3061-
<li><a href="http://redis.io/">Redis</a> is an open source in-memory key-value pair data
3068+
<li>
3069+
<p><a href="http://redis.io/">Redis</a> is an open source in-memory key-value pair data
30623070
store. Redis is often called "the Swiss Army Knife of web application
30633071
development." It can be used for caching, queuing, and storing session data
30643072
for faster access than a traditional relational database, among many other
30653073
use cases. <a href="https://github.com/andymccurdy/redis-py">Redis-py</a> is a solid
3066-
Python client to use with Redis.</li>
3074+
Python client to use with Redis.</p>
3075+
</li>
3076+
<li>
3077+
<p><a href="http://www.memcached.org/">Memcached</a> is another widely used in-memory
3078+
key-value pair storage system.</p>
3079+
</li>
30673080
</ul>
30683081
<h3>Key-value pair resources</h3>
30693082
<ul>
30703083
<li>
3084+
<p><a href="http://dba.stackexchange.com/questions/607/what-is-a-key-value-store-database">What is a key-value store database?</a>
3085+
is a Stack Overflow Q&amp;A that straight on answers this subject.</p>
3086+
</li>
3087+
<li>
30713088
<p>"<a href="https://www.digitalocean.com/community/tutorials/how-to-install-and-use-redis">How To Install and Use Redis</a>"
30723089
is a guide for getting up with the extremely useful in-memory data store.</p>
30733090
</li>
@@ -3211,20 +3228,25 @@ <h2>NoSQL data store resources</h2>
32113228
</li>
32123229
</ul>
32133230
<h2>NoSQL data stores learning checklist</h2>
3214-
<p><i class="fa fa-check-square-o"></i>
3215-
Understand why NoSQL data stores are better for some use cases than relational
3216-
databases. In general these benefits are only seen at large scale so they may
3217-
not be applicable to your web application.</p>
3218-
<p><i class="fa fa-check-square-o"></i>
3219-
Integrate Redis into your project for a speed boost over slower persistent
3220-
storage. Storing session data in memory is generally much faster than saving
3221-
that data in a traditional relational database that uses persistent storage.
3222-
Note that when memory is flushed the data goes away so anything that needs to
3223-
be persistent must still be backed up to disk on a regular basis.</p>
3224-
<p><i class="fa fa-check-square-o"></i>
3225-
Evaluate other use cases such as storing transient logs in document-oriented
3226-
data stores such as MongoDB.</p>
3227-
<h3>What's next?</h3>
3231+
<ol>
3232+
<li>
3233+
<p>Understand why NoSQL data stores are better for some use cases than
3234+
relational databases. In general these benefits are only seen at large
3235+
scale so they may not be applicable to your web application.</p>
3236+
</li>
3237+
<li>
3238+
<p>Integrate Redis into your project for a speed boost over slower persistent
3239+
storage. Storing session data in memory is generally much faster than
3240+
saving that data in a traditional relational database that uses persistent
3241+
storage. Note that when memory is flushed the data goes away so anything
3242+
that needs to be persistent must still be backed up to disk on a regular
3243+
basis.</p>
3244+
</li>
3245+
<li>
3246+
<p>Evaluate other use cases such as storing transient logs in a
3247+
document-oriented data store such as MongoDB.</p>
3248+
</li>
3249+
</ol>
32283250
<h1>Application Programming Interfaces</h1>
32293251
<p>Application programming interfaces (APIs) provide machine-readable
32303252
data transfer and signaling between applications.</p>

‎databases.html‎

Lines changed: 26 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -245,23 +245,32 @@ <h2>Database resources</h2>
245245
</li>
246246
</ul>
247247
<h2>Databases learning checklist</h2>
248-
<p><i class="fa fa-check-square-o"></i>
249-
Install PostgreSQL on your server. Assuming you went with Ubuntu run
250-
<code>sudo apt-get install postgresql</code>.</p>
251-
<p><i class="fa fa-check-square-o"></i>
252-
Make sure the <a href="http://initd.org/psycopg/">psycopg2</a> library is part of your
253-
application dependencies.</p>
254-
<p><i class="fa fa-check-square-o"></i>
255-
Configure your web application to connect to the PostgreSQL instance.</p>
256-
<p><i class="fa fa-check-square-o"></i>
257-
Create models in your ORM, either with Django's
258-
<a href="https://docs.djangoproject.com/en/dev/topics/db/">built-in ORM</a> or
259-
<a href="http://www.sqlalchemy.org/">SQLAlchemy with Flask</a>. </p>
260-
<p><i class="fa fa-check-square-o"></i>
261-
Sync the ORM models with the PostgreSQL instance.</p>
262-
<p><i class="fa fa-check-square-o"></i>
263-
Start creating, reading, updating and deleting data in the database from your
264-
web application.</p>
248+
<ol>
249+
<li>
250+
<p>Install PostgreSQL on your server. Assuming you went with Ubuntu run
251+
<code>sudo apt-get install postgresql</code>.</p>
252+
</li>
253+
<li>
254+
<p>Make sure the <a href="http://initd.org/psycopg/">psycopg2</a> library is in your
255+
application's dependencies.</p>
256+
</li>
257+
<li>
258+
<p>Configure your web application to connect to the PostgreSQL instance.</p>
259+
</li>
260+
<li>
261+
<p>Create models in your ORM, either with Django's
262+
<a href="https://docs.djangoproject.com/en/dev/topics/db/">built-in ORM</a> or
263+
<a href="http://www.sqlalchemy.org/">SQLAlchemy with Flask</a>. </p>
264+
</li>
265+
<li>
266+
<p>Build your database tables or sync the ORM models with the PostgreSQL
267+
instance, if you're using an ORM.</p>
268+
</li>
269+
<li>
270+
<p>Start creating, reading, updating and deleting data in the database
271+
from your web application.</p>
272+
</li>
273+
</ol>
265274
<h3>What's next to get your app running?</h3>
266275
<div class="row">
267276
<div class="col-md-4">

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-26T11:10:24Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-05-26T11:34:18Z</updated></feed>

‎no-sql-datastore.html‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,26 @@ <h2>Key-value Pair</h2>
5454
on <a href="http://en.wikipedia.org/wiki/Hash_table">hash map</a> data structures.</p>
5555
<h3>Key-value pair data stores</h3>
5656
<ul>
57-
<li><a href="http://redis.io/">Redis</a> is an open source in-memory key-value pair data
57+
<li>
58+
<p><a href="http://redis.io/">Redis</a> is an open source in-memory key-value pair data
5859
store. Redis is often called "the Swiss Army Knife of web application
5960
development." It can be used for caching, queuing, and storing session data
6061
for faster access than a traditional relational database, among many other
6162
use cases. <a href="https://github.com/andymccurdy/redis-py">Redis-py</a> is a solid
62-
Python client to use with Redis.</li>
63+
Python client to use with Redis.</p>
64+
</li>
65+
<li>
66+
<p><a href="http://www.memcached.org/">Memcached</a> is another widely used in-memory
67+
key-value pair storage system.</p>
68+
</li>
6369
</ul>
6470
<h3>Key-value pair resources</h3>
6571
<ul>
6672
<li>
73+
<p><a href="http://dba.stackexchange.com/questions/607/what-is-a-key-value-store-database">What is a key-value store database?</a>
74+
is a Stack Overflow Q&amp;A that straight on answers this subject.</p>
75+
</li>
76+
<li>
6777
<p>"<a href="https://www.digitalocean.com/community/tutorials/how-to-install-and-use-redis">How To Install and Use Redis</a>"
6878
is a guide for getting up with the extremely useful in-memory data store.</p>
6979
</li>
@@ -207,20 +217,26 @@ <h2>NoSQL data store resources</h2>
207217
</li>
208218
</ul>
209219
<h2>NoSQL data stores learning checklist</h2>
210-
<p><i class="fa fa-check-square-o"></i>
211-
Understand why NoSQL data stores are better for some use cases than relational
212-
databases. In general these benefits are only seen at large scale so they may
213-
not be applicable to your web application.</p>
214-
<p><i class="fa fa-check-square-o"></i>
215-
Integrate Redis into your project for a speed boost over slower persistent
216-
storage. Storing session data in memory is generally much faster than saving
217-
that data in a traditional relational database that uses persistent storage.
218-
Note that when memory is flushed the data goes away so anything that needs to
219-
be persistent must still be backed up to disk on a regular basis.</p>
220-
<p><i class="fa fa-check-square-o"></i>
221-
Evaluate other use cases such as storing transient logs in document-oriented
222-
data stores such as MongoDB.</p>
223-
<h3>What's next?</h3>
220+
<ol>
221+
<li>
222+
<p>Understand why NoSQL data stores are better for some use cases than
223+
relational databases. In general these benefits are only seen at large
224+
scale so they may not be applicable to your web application.</p>
225+
</li>
226+
<li>
227+
<p>Integrate Redis into your project for a speed boost over slower persistent
228+
storage. Storing session data in memory is generally much faster than
229+
saving that data in a traditional relational database that uses persistent
230+
storage. Note that when memory is flushed the data goes away so anything
231+
that needs to be persistent must still be backed up to disk on a regular
232+
basis.</p>
233+
</li>
234+
<li>
235+
<p>Evaluate other use cases such as storing transient logs in a
236+
document-oriented data store such as MongoDB.</p>
237+
</li>
238+
</ol>
239+
<h3>What do you want to learn about next?</h3>
224240
<div class="row">
225241
<div class="col-md-4">
226242
<div class="well select-next">

‎source/content/pages/05-data/01-data.markdown‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,3 @@ created the incredible mix of data code libraries available today.
7777
provides an overview of the Python language with iPython Notebook for those
7878
in scientific fields.
7979

80-
81-
### What else would you like to learn about Python and data?

‎source/content/pages/05-data/02-databases.markdown‎

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -206,28 +206,21 @@ provider.
206206

207207

208208
## Databases learning checklist
209-
<i class="fa fa-check-square-o"></i>
210-
Install PostgreSQL on your server. Assuming you went with Ubuntu run
211-
``sudo apt-get install postgresql``.
209+
1. Install PostgreSQL on your server. Assuming you went with Ubuntu run
210+
``sudo apt-get install postgresql``.
212211

213-
<i class="fa fa-check-square-o"></i>
214-
Make sure the [psycopg2](http://initd.org/psycopg/) library is part of your
215-
application dependencies.
212+
1. Make sure the [psycopg2](http://initd.org/psycopg/) library is in your
213+
application's dependencies.
216214

217-
<i class="fa fa-check-square-o"></i>
218-
Configure your web application to connect to the PostgreSQL instance.
215+
1. Configure your web application to connect to the PostgreSQL instance.
219216

220-
<i class="fa fa-check-square-o"></i>
221-
Create models in your ORM, either with Django's
222-
[built-in ORM](https://docs.djangoproject.com/en/dev/topics/db/) or
223-
[SQLAlchemy with Flask](http://www.sqlalchemy.org/).
217+
1. Create models in your ORM, either with Django's
218+
[built-in ORM](https://docs.djangoproject.com/en/dev/topics/db/) or
219+
[SQLAlchemy with Flask](http://www.sqlalchemy.org/).
224220

225-
<i class="fa fa-check-square-o"></i>
226-
Sync the ORM models with the PostgreSQL instance.
221+
1. Build your database tables or sync the ORM models with the PostgreSQL
222+
instance, if you're using an ORM.
227223

228-
<i class="fa fa-check-square-o"></i>
229-
Start creating, reading, updating and deleting data in the database from your
230-
web application.
224+
1. Start creating, reading, updating and deleting data in the database
225+
from your web application.
231226

232-
233-
### What's next to get your app running?

‎source/content/pages/05-data/03-nosql.markdown‎

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ persistent data. However, there are several alternative classifications of
1111
storage representations.
1212

1313
1. Key-value pair
14-
2. Document-oriented
15-
3. Column-family table
16-
4. Graph
14+
1. Document-oriented
15+
1. Column-family table
16+
1. Graph
1717

1818
These persistent data storage representations are commonly used to augment,
1919
rather than completely replace, relational databases. The underlying
@@ -35,8 +35,14 @@ on [hash map](http://en.wikipedia.org/wiki/Hash_table) data structures.
3535
use cases. [Redis-py](https://github.com/andymccurdy/redis-py) is a solid
3636
Python client to use with Redis.
3737

38+
* [Memcached](http://www.memcached.org/) is another widely used in-memory
39+
key-value pair storage system.
40+
3841

3942
### Key-value pair resources
43+
* [What is a key-value store database?](http://dba.stackexchange.com/questions/607/what-is-a-key-value-store-database)
44+
is a Stack Overflow Q&A that straight on answers this subject.
45+
4046
* "[How To Install and Use Redis](https://www.digitalocean.com/community/tutorials/how-to-install-and-use-redis)"
4147
is a guide for getting up with the extremely useful in-memory data store.
4248

@@ -162,23 +168,18 @@ representing a person could have a property of "female" or "male".
162168
datastores with attributes and the best use cases for each one.
163169

164170

165-
166171
## NoSQL data stores learning checklist
167-
<i class="fa fa-check-square-o"></i>
168-
Understand why NoSQL data stores are better for some use cases than relational
169-
databases. In general these benefits are only seen at large scale so they may
170-
not be applicable to your web application.
171-
172-
<i class="fa fa-check-square-o"></i>
173-
Integrate Redis into your project for a speed boost over slower persistent
174-
storage. Storing session data in memory is generally much faster than saving
175-
that data in a traditional relational database that uses persistent storage.
176-
Note that when memory is flushed the data goes away so anything that needs to
177-
be persistent must still be backed up to disk on a regular basis.
172+
1. Understand why NoSQL data stores are better for some use cases than
173+
relational databases. In general these benefits are only seen at large
174+
scale so they may not be applicable to your web application.
178175

179-
<i class="fa fa-check-square-o"></i>
180-
Evaluate other use cases such as storing transient logs in document-oriented
181-
data stores such as MongoDB.
176+
1. Integrate Redis into your project for a speed boost over slower persistent
177+
storage. Storing session data in memory is generally much faster than
178+
saving that data in a traditional relational database that uses persistent
179+
storage. Note that when memory is flushed the data goes away so anything
180+
that needs to be persistent must still be backed up to disk on a regular
181+
basis.
182182

183+
1. Evaluate other use cases such as storing transient logs in a
184+
document-oriented data store such as MongoDB.
183185

184-
### What's next?

‎source/theme/templates/choices/data.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<h3>What else would you like to learn about Python and data?</h3>
12
<div class="row">
23
<div class="col-md-4">
34
<div class="well select-next">

‎source/theme/templates/choices/databases.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<h3>What's next to get your app running?</h3>
12
<div class="row">
23
<div class="col-md-4">
34
<div class="well select-next">

‎source/theme/templates/choices/no-sql-datastore.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<h3>What do you want to learn about next?</h3>
12
<div class="row">
23
<div class="col-md-4">
34
<div class="well select-next">

0 commit comments

Comments
 (0)