Skip to content

Commit a85236b

Browse files
committed
cleaning up some sections of version control and app dependencies
1 parent ea8323c commit a85236b

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

application-dependencies.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ <h2>Isolating application dependencies</h2>
9191
own copy of the Python interpreter and depedencies in the site-packages
9292
directory. To use a virtualenv it must first be created with the virtualenv
9393
command and then activated.</p>
94-
<h2>Downloading and installing Python dependencies</h2>
94+
<h2>Installing Python dependencies</h2>
9595
<p>The recommended way to install Python library dependencies is with the
9696
<a href="http://www.pip-installer.org/en/latest/">pip</a> command when a virtualenv
9797
is activated.</p>
@@ -103,7 +103,6 @@ <h2>requirements.txt</h2>
103103
<a href="http://www.pip-installer.org/en/1.4.1/cookbook.html#requirements-files">requirements.txt</a>
104104
file. When you build a Python web application you should include a
105105
requirements.txt file. </p>
106-
<h3>requirements.txt example with pegged dependencies</h3>
107106
<p>Python projects' dependencies for a web application should be specified in the
108107
requirements.txt with
109108
<a href="https://devcenter.heroku.com/articles/python-pip">pegged dependencies</a> like

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>2014-05-10T13:30: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>2014-05-10T14:50:02Z</updated></feed>

source-control.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h2>Why is source control necessary?</h2>
5757
a necessity regardless of time size or the programming ecosystem used. Every
5858
project should immediately begin by using a version control system such
5959
as Git or Mercurial.</p>
60-
<h2>Source Control Systems</h2>
60+
<h2>Source control systems</h2>
6161
<ul>
6262
<li>
6363
<p><a href="http://git-scm.com/">Git</a> is a free and open source distributed version
@@ -68,7 +68,7 @@ <h2>Source Control Systems</h2>
6868
and open source distributed version control system.</p>
6969
</li>
7070
</ul>
71-
<h2>Source Control Third Party Services</h2>
71+
<h2>Source control hosted services</h2>
7272
<ul>
7373
<li>
7474
<p><a href="https://github.com/">GitHub</a> is currently the most commonly used source
@@ -80,7 +80,7 @@ <h2>Source Control Third Party Services</h2>
8080
users. Users pay for hosting private repositories with more than five users.</p>
8181
</li>
8282
</ul>
83-
<h2>Source Control Resources</h2>
83+
<h2>Source control resources</h2>
8484
<ul>
8585
<li>
8686
<p><a href="http://git-scm.com/book">Pro Git</a> is a free open source book that walks

source/content/pages/03-deployment/0313-source-control.markdown

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ project should immediately begin by using a version control system such
3333
as Git or Mercurial.
3434

3535

36-
## Source Control Systems
36+
## Source control systems
3737
* [Git](http://git-scm.com/) is a free and open source distributed version
3838
control system.
3939

4040
* [Mercurial](http://mercurial.selenic.com/) is similar to Git, also a free
4141
and open source distributed version control system.
4242

4343

44-
## Source Control Third Party Services
44+
## Source control hosted services
4545
* [GitHub](https://github.com/) is currently the most commonly used source
4646
control platform for using Git.
4747

@@ -50,7 +50,7 @@ as Git or Mercurial.
5050
users. Users pay for hosting private repositories with more than five users.
5151

5252

53-
## Source Control Resources
53+
## Source control resources
5454
* [Pro Git](http://git-scm.com/book) is a free open source book that walks
5555
through all aspects of using the version control system.
5656

source/content/pages/03-deployment/0315-application-dependencies.markdown

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ directory. To use a virtualenv it must first be created with the virtualenv
6666
command and then activated.
6767

6868

69-
## Downloading and installing Python dependencies
69+
## Installing Python dependencies
7070
The recommended way to install Python library dependencies is with the
7171
[pip](http://www.pip-installer.org/en/latest/) command when a virtualenv
7272
is activated.
@@ -82,8 +82,6 @@ The pip convention for specifying application dependencies is with a
8282
file. When you build a Python web application you should include a
8383
requirements.txt file.
8484

85-
86-
### requirements.txt example with pegged dependencies
8785
Python projects' dependencies for a web application should be specified in the
8886
requirements.txt with
8987
[pegged dependencies](https://devcenter.heroku.com/articles/python-pip) like
@@ -109,7 +107,7 @@ deliberately upgrade and test to make sure there were no backwards-incompatible
109107
modifications in newer dependency library versions.
110108

111109

112-
##setup.py
110+
## setup.py
113111
There is another type of dependency specification for Python libraries
114112
known as
115113
[setup.py](http://stackoverflow.com/questions/1471994/what-is-setup-py).

0 commit comments

Comments
 (0)