Skip to content

Commit 0e03f43

Browse files
committed
Website build
1 parent 115ba35 commit 0e03f43

32 files changed

+19933
-187
lines changed

0_preface.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ <h3>The exercises<a class="headerlink" href="#the-exercises" title="Permalink to
167167
feedback and enable you to know how you are doing. Links to the skeleton code
168168
for each chapter are provided at:</p>
169169
<blockquote>
170-
<div><p><a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">https://object-oriented-programming.github.io/edition1/exercises.html</a></p>
170+
<div><p><a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">https://object-oriented-python.github.io/edition1/exercises.html</a></p>
171171
</div></blockquote>
172172
</section>
173173
</section>
@@ -210,12 +210,14 @@ <h2>Acknowledgements<a class="headerlink" href="#acknowledgements" title="Permal
210210
completely online during the COVID pandemic. I’d like to thank teaching fellow
211211
Dr Matthew Woolway who worked tirelessly with me on the module and who put
212212
together many of the tests on the exercises, and the graduate teaching
213-
assistants Miguel Boland, Sophia Vorderwuelbecke and Connor Ward whose
213+
assistants Miguel Boland, Sophia Vorderwuelbecke, and Connor Ward whose
214214
professionalism in delivering the course in very complex circumstances was
215215
outstanding. Pulling out all the stops to deliver the written and video
216216
materials for online learning meant a lot of evenings and weekends. I am
217217
exceptionally grateful to my wife Gebina Ham for disproportionately picking up
218-
our childcare responsibilities in that period in order to make this possible.</p>
218+
our childcare responsibilities in that period in order to make this possible.
219+
I’d also like to thank Dr Aaron Pereira for his eagle-eyed corrections to the
220+
text.</p>
219221
<p>This is a textbook about programming in Python, so it would be remiss of me not
220222
to also thank the developers of the Python language, its CPython reference
221223
implementation, and all the third party packages which on which this book

10_further_object-oriented_features.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ <h2><span class="section-number">10.3. </span>Glossary<a class="headerlink" href
550550
</section>
551551
<section id="exercises">
552552
<h2><span class="section-number">10.4. </span>Exercises<a class="headerlink" href="#exercises" title="Permalink to this headline"></a></h2>
553-
<p>Using the information on the <a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">book website</a>
553+
<p>Using the information on the <a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">book website</a>
554554
obtain the skeleton code for these exercises.</p>
555555
<div class="proof proof-type-exercise" id="id8">
556556

@@ -593,7 +593,7 @@ <h2><span class="section-number">10.4. </span>Exercises<a class="headerlink" hre
593593
you really want to know how some part of the language works.</p>
594594
</dd>
595595
<dt class="label" id="exercise-page"><span class="brackets"><a class="fn-backref" href="#id4">2</a></span></dt>
596-
<dd><p><a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">https://object-oriented-programming.github.io/edition1/exercises.html</a></p>
596+
<dd><p><a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">https://object-oriented-python.github.io/edition1/exercises.html</a></p>
597597
</dd>
598598
</dl>
599599
</section>

1_introduction.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,8 @@ <h2><span class="section-number">1.3. </span>Installing Python packages<a class=
315315
<p><a class="reference external" href="https://pypi.org">PyPI</a> is the Python Package Index. It is the
316316
official download location for publicly released Python packages which
317317
aren’t themselves a part of the built-in <a class="reference external" href="https://docs.python.org/3/library/index.html" title="(in Python v3.10)"><span class="xref std std-doc">Python Standard Library</span></a>. Many important mathematical packages
318-
including <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> and <a class="reference external" href="https://www.sympy.org">sympy</a> are
319-
distributed from PyPI. Suppose your venv doesn’t have <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>
318+
including <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> and <a class="reference external" href="https://www.sympy.org">sympy</a> are
319+
distributed from PyPI. Suppose your venv doesn’t have <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>
320320
installed and you need it. You would install it with the following
321321
terminal command:</p>
322322
<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="gp gp-VirtualEnv">(PoP_venv)</span> <span class="gp">$ </span>python -m pip install numpy

2_programs_in_files.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,14 +356,14 @@ <h3><span class="section-number">2.3.2. </span>Other forms of import<a class="he
356356
don’t really want to write <a class="reference external" href="https://docs.python.org/3/library/math.html#math.sin" title="(in Python v3.10)"><code class="xref py py-func docutils literal notranslate"><span class="pre">math.sin()</span></code></a> in every trig formula you
357357
ever write. One alternative is to rename the module on import. This is
358358
achieved using the keyword <a class="reference external" href="https://docs.python.org/3/reference/simple_stmts.html#import" title="(in Python v3.10)"><code class="xref std std-keyword docutils literal notranslate"><span class="pre">as</span></code></a> in an import statement. For example,
359-
it is usual to import the numerical Python module <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> in the
359+
it is usual to import the numerical Python module <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> in the
360360
following way:</p>
361361
<div class="highlight-python notranslate"><div class="highlight"><pre><span></span><span class="kn">import</span> <span class="nn">numpy</span> <span class="k">as</span> <span class="nn">np</span>
362362
</pre></div>
363363
</div>
364-
<p>This creates the local name <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">np</span></code></a> instead of <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>,
364+
<p>This creates the local name <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">np</span></code></a> instead of <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>,
365365
so that the function for creating an evenly spaced sequence of values
366-
between to end points is now accessible as <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.linspace.html#numpy.linspace" title="(in NumPy v1.21)"><code class="xref py py-func docutils literal notranslate"><span class="pre">np.linspace</span></code></a>.</p>
366+
between to end points is now accessible as <a class="reference external" href="https://numpy.org/doc/stable/reference/generated/numpy.linspace.html#numpy.linspace" title="(in NumPy v1.22)"><code class="xref py py-func docutils literal notranslate"><span class="pre">np.linspace</span></code></a>.</p>
367367
<p>A second option is to import particular names from a module directly
368368
into the current namespace. For example, if we planned to use the
369369
functions <a class="reference external" href="https://docs.python.org/3/library/math.html#math.sin" title="(in Python v3.10)"><code class="xref py py-func docutils literal notranslate"><span class="pre">math.sin()</span></code></a> and <a class="reference external" href="https://docs.python.org/3/library/math.html#math.cos" title="(in Python v3.10)"><code class="xref py py-func docutils literal notranslate"><span class="pre">math.cos()</span></code></a> a lot in our script, we
@@ -610,10 +610,10 @@ <h3><span class="section-number">2.4.5. </span>Package dependencies<a class="hea
610610
takes a list of Pip package names. Pip will install any of these packages that
611611
are not already available before installing the package itself.
612612
<a class="reference internal" href="#dependency-setup-py"><span class="std std-numref">Listing 2.3</span></a> illustrates this by adding a dependency on
613-
<a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>.</p>
613+
<a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a>.</p>
614614
<div class="literal-block-wrapper docutils container" id="id10">
615615
<span id="dependency-setup-py"></span><div class="code-block-caption"><span class="caption-number">Listing 2.3 </span><span class="caption-text">An extension to the <code class="file docutils literal notranslate"><span class="pre">setup.py</span></code> from
616-
<a class="reference internal" href="#minimal-setup-py"><span class="std std-numref">Listing 2.2</span></a> to require that <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.21)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> is installed.</span><a class="headerlink" href="#id10" title="Permalink to this code"></a></div>
616+
<a class="reference internal" href="#minimal-setup-py"><span class="std std-numref">Listing 2.2</span></a> to require that <a class="reference external" href="https://numpy.org/doc/stable/reference/index.html#module-numpy" title="(in NumPy v1.22)"><code class="xref py py-mod docutils literal notranslate"><span class="pre">numpy</span></code></a> is installed.</span><a class="headerlink" href="#id10" title="Permalink to this code"></a></div>
617617
<div class="highlight-python3 notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">setuptools</span> <span class="kn">import</span> <span class="n">setup</span><span class="p">,</span> <span class="n">find_packages</span>
618618
<span class="n">setup</span><span class="p">(</span>
619619
<span class="n">name</span><span class="o">=</span><span class="s2">&quot;my_package&quot;</span><span class="p">,</span>
@@ -646,7 +646,7 @@ <h2><span class="section-number">2.5. </span>Testing frameworks<a class="headerl
646646
including tests in your code here.</p>
647647
<p>There are a number of Python packages which support code testing. The concepts
648648
are largely similar so rather than get bogged down in the details of multiple
649-
frameworks, we will introduce <a class="reference external" href="https://docs.pytest.org/en/latest/index.html" title="(in pytest v7.1.0.dev46+g47df71d23)"><span class="xref std std-doc">Pytest</span></a>, which is one of the
649+
frameworks, we will introduce <a class="reference external" href="https://docs.pytest.org/en/latest/index.html" title="(in pytest v7.1.0.dev95+g71baf24b6)"><span class="xref std std-doc">Pytest</span></a>, which is one of the
650650
most widely used. Pytest is simply a Python package, so you can install it into
651651
your current environment using:</p>
652652
<div class="highlight-console notranslate"><div class="highlight"><pre><span></span><span class="gp gp-VirtualEnv">(PoP_venv)</span> <span class="gp">$ </span>python -m pip install pytest
@@ -864,7 +864,7 @@ <h2><span class="section-number">2.7. </span>Glossary<a class="headerlink" href=
864864
<span class="proof-type">Exercise 2.2</span>
865865

866866
</div><div class="proof-content">
867-
<p>Using the information on the <a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">book website</a>
867+
<p>Using the information on the <a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">book website</a>
868868
create your first exercise repository for this module and clone it
869869
into your working folder. The exercise repository just contains a
870870
<code class="file docutils literal notranslate"><span class="pre">README</span></code> and some tests. Your job in the following exercises will be
@@ -940,7 +940,7 @@ <h2><span class="section-number">2.7. </span>Glossary<a class="headerlink" href=
940940
<dd><p><a class="reference external" href="https://github.com/object-oriented-python/object-oriented-programming">https://github.com/object-oriented-python/object-oriented-programming</a></p>
941941
</dd>
942942
<dt class="label" id="exercise-page"><span class="brackets"><a class="fn-backref" href="#id7">5</a></span></dt>
943-
<dd><p><a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">https://object-oriented-programming.github.io/edition1/exercises.html</a></p>
943+
<dd><p><a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">https://object-oriented-python.github.io/edition1/exercises.html</a></p>
944944
</dd>
945945
</dl>
946946
</section>

3_objects.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ <h2><span class="section-number">3.5. </span>Glossary<a class="headerlink" href=
813813
</section>
814814
<section id="exercises">
815815
<h2><span class="section-number">3.6. </span>Exercises<a class="headerlink" href="#exercises" title="Permalink to this headline"></a></h2>
816-
<p>Using the information on the <a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">book website</a>
816+
<p>Using the information on the <a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">book website</a>
817817
obtain the skeleton code for these exercises. The skeleton code contains a
818818
<code class="xref py py-mod docutils literal notranslate"><span class="pre">polynomial</span></code> package with a version of the <code class="xref py py-class docutils literal notranslate"><span class="pre">Polynomial</span></code> class.</p>
819819
<div class="proof proof-type-exercise" id="id5">
@@ -891,7 +891,7 @@ <h2><span class="section-number">3.6. </span>Exercises<a class="headerlink" href
891891
</div></div><p class="rubric">Footnotes</p>
892892
<dl class="footnote brackets">
893893
<dt class="label" id="exercise-page"><span class="brackets"><a class="fn-backref" href="#id2">1</a></span></dt>
894-
<dd><p><a class="reference external" href="https://object-oriented-programming.github.io/edition1/exercises.html">https://object-oriented-programming.github.io/edition1/exercises.html</a></p>
894+
<dd><p><a class="reference external" href="https://object-oriented-python.github.io/edition1/exercises.html">https://object-oriented-python.github.io/edition1/exercises.html</a></p>
895895
</dd>
896896
</dl>
897897
</section>

0 commit comments

Comments
 (0)