Skip to content

Commit 325dc8b

Browse files
committed
Update docs for SQLObject 3.1.0b1
1 parent 86d9eab commit 325dc8b

File tree

107 files changed

+6422
-5549
lines changed

Some content is hidden

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

107 files changed

+6422
-5549
lines changed

devel/DeveloperGuide.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ <h1>Development Installation</h1>
6363
create a separate branch, push it to your fork and create a pull request
6464
to the original repo. That way CI will be triggered to test your code.</p>
6565
<p>Voila! The packages are globally installed, but the files from the
66-
checkout were not copied into <tt class="docutils literal"><span class="pre">site-packages</span></tt>. See <a href="http://pythonhosted.org/setuptools/" class="reference external">setuptools</a> for more.</p>
66+
checkout were not copied into <tt class="docutils literal"><span class="pre">site-packages</span></tt>. See <a href="https://setuptools.readthedocs.io/en/latest/index.html" class="reference external">setuptools</a> for more.</p>
6767
</div>
6868
<div class="section" id="architecture">
6969
<h1>Architecture</h1>
@@ -123,7 +123,7 @@ <h2>Columns, validators and converters</h2>
123123
</div>
124124
<div class="section" id="style-guide">
125125
<h1>Style Guide</h1>
126-
<p>Generally you should follow the recommendations in <a href="http://www.python.org/peps/pep-0008.html" class="reference external">PEP 8</a>, the
126+
<p>Generally you should follow the recommendations in <a href="http://www.python.org/dev/peps/pep-0008/" class="reference external">PEP 8</a>, the
127127
Python Style Guide. Some things to take particular note of:</p>
128128
<ul class="simple">
129129
<li>With a few exceptions sources must be <a href="https://gitlab.com/pycqa/flake8" class="reference external">flake8</a>-clean (and hence
@@ -234,9 +234,9 @@ <h1>Style Guide</h1>
234234
<h1>Testing</h1>
235235
<p>Tests are important. Tests keep everything from falling apart. All
236236
new additions should have tests.</p>
237-
<p>Testing uses py.test, an alternative to <tt class="docutils literal">unittest</tt>. It is available at
238-
<a href="http://pytest.org/" class="reference external">http://pytest.org/</a> and <a href="https://pypi.python.org/pypi/pytest" class="reference external">https://pypi.python.org/pypi/pytest</a>. Read its <a href="http://pytest.org/latest/getting-started.html" class="reference external">getting
239-
started</a> document for more.</p>
237+
<p>Testing uses py.test, an alternative to <tt class="docutils literal">unittest</tt>. It is available
238+
at <a href="http://pytest.org/" class="reference external">http://pytest.org/</a> and <a href="https://pypi.python.org/pypi/pytest" class="reference external">https://pypi.python.org/pypi/pytest</a>. Read its
239+
<a href="http://docs.pytest.org/en/latest/getting-started.html" class="reference external">getting started</a> document for more.</p>
240240
<p>To actually run the test, you have to give it a database to connect to.
241241
You do so with the option <tt class="docutils literal"><span class="pre">-D</span></tt>. You can either give a complete URI or
242242
one of several shortcuts like <tt class="docutils literal">mysql</tt> (these shortcuts are defined in
@@ -252,7 +252,7 @@ <h1>Testing</h1>
252252
<p><tt class="docutils literal">supports(featureName)</tt> checks if the database backend supports the
253253
named feature. What backends support what is defined at the top of
254254
<tt class="docutils literal">dbtest</tt>.</p>
255-
<p>If you <tt class="docutils literal">import *</tt> you'll also get py.test's version of <a href="http://pytest.org/latest/assert.html#assertions-about-expected-exceptions" class="reference external">raises</a>, an
255+
<p>If you <tt class="docutils literal">import *</tt> you'll also get py.test's version of <a href="http://docs.pytest.org/en/latest/assert.html#assertions-about-expected-exceptions" class="reference external">raises</a>, an
256256
<tt class="docutils literal">inserts</tt> function that can create instances for you, and a couple
257257
miscellaneous functions.</p>
258258
<p>If you submit a patch or implement a feature without a test, we'll be
@@ -261,7 +261,7 @@ <h1>Testing</h1>
261261
exercised, even if the tests are absolutely complete.</p>
262262
<p>We now use Travis CI to run tests. See the status:</p>
263263
<a href="https://travis-ci.org/sqlobject/sqlobject" class="reference external image-reference"><img src="https://travis-ci.org/sqlobject/sqlobject.svg?branch=master" alt="https://travis-ci.org/sqlobject/sqlobject.svg?branch=master"></a>
264-
<p>To avoid triggering unnecessary test run at Travis add text <a href="https://docs.travis-ci.com/user/customizing-the-build/#Skipping-a-build" class="reference external">[ci skip]</a>
264+
<p>To avoid triggering unnecessary test run at Travis add text <a href="https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build" class="reference external">[ci skip]</a>
265265
anywhere in your commit messages for commits that don't change code
266266
(documentation updates and such).</p>
267267
</div>

devel/Inheritance.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ <h2>Why</h2>
198198
</div>
199199
<div class="section" id="who-what-and-how">
200200
<h2>Who, What and How</h2>
201-
<p>Daniel Savard has implemented inheritance for SQLObject. According to
202-
<a href="http://www.objectmatter.com/vbsf/docs/maptool/ormapping.html" class="reference external">ObjectMatter</a> this is a kind of vertical inheritance. The only difference
203-
is that objects reference their leaves, not parents. Links to parents are
201+
<p>Daniel Savard has implemented inheritance for SQLObject. In <a href="https://cayenne.apache.org/docs/3.0/modeling-inheritance.html" class="reference external">terms of
202+
ORM</a> this is a kind of vertical inheritance. The only difference is
203+
that objects reference their leaves, not parents. Links to parents are
204204
reconstructed at run-time using the hierarchy of Python classes.</p>
205205
<ul class="simple">
206206
<li>As suggested by Ian Bicking, each child class now has the same

0 commit comments

Comments
 (0)