Skip to content

Commit fe1df09

Browse files
authored
Merge pull request #135 from hjwp/django-chapter-text-revisions
revisions from working thru part 1 manually
2 parents 0d0414a + 7b6378e commit fe1df09

File tree

56 files changed

+2556
-2359
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2556
-2359
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ tags
66
pdf_drafts
77
pycon
88
source/*/static
9-
source/*/virtualenv
9+
source/*/.venv
1010
source/*/database
1111
chapter_*.html
1212
appendix_*.html

README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ and collaboration (typo-fixes by pull request are very much encouraged).
2727

2828
* Pre-requisites for the test suite:
2929
```console
30-
$ mkvirtualenv --python=python3 tddbook
3130
$ pip install -r requirements.txt
3231
$ git submodule update --init
3332
```

acknowledgments.asciidoc

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
[preface]
2-
Acknowledgments
3-
---------------
2+
== Acknowledgments
43

54
Lots of people to thank, without whom this book would never have happened,
65
and/or would have been even worse than it is.
@@ -80,8 +79,7 @@ and make it up to you in any way I can.
8079
And finally thanks to you, the latest reader, for deciding to check out
8180
the book! I hope you enjoy it.
8281

83-
Additional Thanks for the Second Edition
84-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
82+
=== Additional Thanks for the Second Edition
8583

8684
Thanks to my wonderful editor for the second edition, Nan Barber, and to
8785
Susan Conant, Kristen Brown, and the whole team at O'Reilly.
@@ -101,3 +99,8 @@ gonulate, Margie Roswell, Ben Elliott, Ramsay Mayka, peterj, 1hx, Wi, Duncan
10199
Betts, Matthew Senko, Neric "Kasu" Kaz, Dominic Scotto, Andrey Makarov,
102100
and many, many more.
103101

102+
=== Additional Thanks for the Thid Edition
103+
104+
At the time of writing we'd only just started,
105+
but thanks in advance to my editor Rita Fernando,
106+
and thanks to my tech reviewers Csanad and David for volunteering!

appendix_III_provisioning_with_ansible.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ User={{ ansible_ssh_user }}
170170
WorkingDirectory=/home/{{ ansible_ssh_user }}/sites/{{ host }}
171171
EnvironmentFile=/home/{{ ansible_ssh_user }}/sites/{{ host }}/.env
172172
Restart=on-failure
173-
ExecStart=/home/{{ ansible_ssh_user }}/sites/{{ host }}/virtualenv/bin/gunicorn \
173+
ExecStart=/home/{{ ansible_ssh_user }}/sites/{{ host }}/.venv/bin/gunicorn \
174174
--bind unix:/tmp/{{ host }}.socket \
175175
--access-logfile ../access.log \
176176
--error-logfile ../error.log \

appendix_rest_api.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ $ pass:quotes[*python manage.py test functional_tests.test_simple_list_creation*
552552
[...]
553553
FAIL: test_can_start_a_list_for_one_user
554554
[...]
555-
File "...python-tdd-book/functional_tests/test_simple_list_creation.py", line
555+
File "...goat-book/functional_tests/test_simple_list_creation.py", line
556556
32, in test_can_start_a_list_for_one_user
557557
self.wait_for_row_in_list_table('1: Buy peacock feathers')
558558
[...]
@@ -908,7 +908,7 @@ Yep, we're almost there but not quite:
908908
Expected: "/listitemsapi/"
909909
Result: []
910910
Diff: "/listitemsapi/"[]
911-
Source: file://...python-tdd-book/lists/static/tests/tests.html:124:15
911+
Source: file://...goat-book/lists/static/tests/tests.html:124:15
912912
----
913913

914914
And we fix it thusly:

atlas.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
],
5858
"formats": {
5959
"pdf": {
60-
"version": "print",
60+
"version": "web",
6161
"toc": true,
6262
"index": true,
6363
"antennahouse_version": "AHFormatterV62_64-MR4",

bibliography.asciidoc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
Bibliography
55
------------
66

7+
TODO remove this chapter entirely,
8+
or remove links from text (they dont work),
9+
and strip down to just the most important books.
10+
711
- [[[dip]]] Mark Pilgrim, 'Dive Into Python': http://www.diveintopython.net/
812
- [[[lpthw]]] Zed A. Shaw, 'Learn Python the Hard Way': http://learnpythonthehardway.org/
913
- [[[iwp]]] Al Sweigart, 'Invent Your Own Computer Games with Python': http://inventwithpython.com

0 commit comments

Comments
 (0)