Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 64d0206

Browse files
committed
Update devel docs: AppVeyor, sqlite
1 parent 7a4c4bc commit 64d0206

File tree

9 files changed

+26
-14
lines changed

9 files changed

+26
-14
lines changed

‎devel/DeveloperGuide.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,9 @@ <h2>Testing<a class="headerlink" href="#testing" title="Permalink to this headli
335335
forced to write the test. That&#8217;s no fun for us, to just be writing
336336
tests. So please, write tests; everything at least needs to be
337337
exercised, even if the tests are absolutely complete.</p>
338-
<p>We now use Travis CI to run tests. See the statuses:</p>
338+
<p>We now use Travis CI and AppVeyor to run tests. See the statuses:</p>
339339
<a class="reference external image-reference" href="https://travis-ci.org/sqlobject/sqlobject"><img alt="https://travis-ci.org/sqlobject/sqlobject.svg?branch=master" src="https://travis-ci.org/sqlobject/sqlobject.svg?branch=master" /></a>
340+
<a class="reference external image-reference" href="https://ci.appveyor.com/project/phdru/sqlobject"><img alt="https://ci.appveyor.com/api/projects/status/github/sqlobject/sqlobject?branch=master" src="https://ci.appveyor.com/api/projects/status/github/sqlobject/sqlobject?branch=master" /></a>
340341
<p>To avoid triggering unnecessary test run at CI services add text <a class="reference external" href="https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build">[skip ci]</a> or
341342
<code class="docutils literal"><span class="pre">[ci</span> <span class="pre">skip]</span></code> anywhere in your commit messages for commits that don&#8217;t change
342343
code (documentation updates and such).</p>

‎devel/News.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,9 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
202202
<li>Drop <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code>.</li>
203203
<li>Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
204204
and firebirdsql). There are problems with tests.</li>
205-
<li>Add appveyor for windows testing. Run tests with Postgres and MS SQL. There
206-
are problems.</li>
205+
<li>Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
206+
are problems with MS SQL.</li>
207+
<li>Run sqlite tests at AppVeyor.</li>
207208
</ul>
208209
</div>
209210
</div>

‎devel/_modules/sqlobject/mysql/mysqlconnection.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,8 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
237237
<span class="n">conn</span><span class="o">.</span><span class="n">autocommit</span> <span class="o">=</span> <span class="n">auto</span>
238238

239239
<span class="k">def</span> <span class="nf">_executeRetry</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">conn</span><span class="p">,</span> <span class="n">cursor</span><span class="p">,</span> <span class="n">query</span><span class="p">):</span>
240+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">debug</span><span class="p">:</span>
241+
<span class="bp">self</span><span class="o">.</span><span class="n">printDebug</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="n">query</span><span class="p">,</span> <span class="s1">&#39;QueryR&#39;</span><span class="p">)</span>
240242
<span class="n">dbEncoding</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span>
241243
<span class="k">if</span> <span class="n">dbEncoding</span> <span class="ow">and</span> <span class="ow">not</span> <span class="nb">isinstance</span><span class="p">(</span><span class="n">query</span><span class="p">,</span> <span class="nb">bytes</span><span class="p">)</span> <span class="ow">and</span> <span class="p">(</span>
242244
<span class="bp">self</span><span class="o">.</span><span class="n">driver</span> <span class="o">==</span> <span class="s1">&#39;connector&#39;</span><span class="p">):</span>

‎devel/_modules/sqlobject/tests/test_parse_uri.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ <h1>Source code for sqlobject.tests.test_parse_uri</h1><div class="highlight"><p
159159
<span class="k">assert</span> <span class="n">password</span> <span class="ow">is</span> <span class="kc">None</span>
160160
<span class="k">assert</span> <span class="n">host</span> <span class="ow">is</span> <span class="kc">None</span>
161161
<span class="k">assert</span> <span class="n">port</span> <span class="ow">is</span> <span class="kc">None</span>
162-
<span class="k">assert</span> <span class="n">path</span> <span class="o">==</span> <span class="s2">&quot;/C:/full/path/to/database&quot;</span>
162+
<span class="k">assert</span> <span class="n">path</span> <span class="o">==</span> <span class="s2">&quot;C:/full/path/to/database&quot;</span>
163163
<span class="k">assert</span> <span class="n">args</span> <span class="o">==</span> <span class="p">{}</span>
164164

165165
<span class="n">user</span><span class="p">,</span> <span class="n">password</span><span class="p">,</span> <span class="n">host</span><span class="p">,</span> <span class="n">port</span><span class="p">,</span> <span class="n">path</span><span class="p">,</span> <span class="n">args</span> <span class="o">=</span> \
@@ -168,7 +168,7 @@ <h1>Source code for sqlobject.tests.test_parse_uri</h1><div class="highlight"><p
168168
<span class="k">assert</span> <span class="n">password</span> <span class="ow">is</span> <span class="kc">None</span>
169169
<span class="k">assert</span> <span class="n">host</span> <span class="ow">is</span> <span class="kc">None</span>
170170
<span class="k">assert</span> <span class="n">port</span> <span class="ow">is</span> <span class="kc">None</span>
171-
<span class="k">assert</span> <span class="n">path</span> <span class="o">==</span> <span class="s2">&quot;/C:/full/path/to/database&quot;</span>
171+
<span class="k">assert</span> <span class="n">path</span> <span class="o">==</span> <span class="s2">&quot;C:/full/path/to/database&quot;</span>
172172
<span class="k">assert</span> <span class="n">args</span> <span class="o">==</span> <span class="p">{}</span></div>
173173

174174

@@ -215,7 +215,7 @@ <h1>Source code for sqlobject.tests.test_parse_uri</h1><div class="highlight"><p
215215

216216
<span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;nt&#39;</span><span class="p">:</span>
217217
<span class="n">connection</span><span class="o">.</span><span class="n">filename</span> <span class="o">=</span> <span class="s1">&#39;C:/full/path/to/database&#39;</span>
218-
<span class="k">assert</span> <span class="n">connection</span><span class="o">.</span><span class="n">uri</span><span class="p">()</span> <span class="o">==</span> <span class="s2">&quot;sqlite:///C:/full/path/to/database&quot;</span></div>
218+
<span class="k">assert</span> <span class="n">connection</span><span class="o">.</span><span class="n">uri</span><span class="p">()</span> <span class="o">==</span> <span class="s2">&quot;sqlite:///C%3A/full/path/to/database&quot;</span></div>
219219
</pre></div>
220220

221221
</div>

‎devel/_modules/sqlobject/tests/test_postgres.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ <h3>Quick search</h3>
6969
<div class="body" role="main">
7070

7171
<h1>Source code for sqlobject.tests.test_postgres</h1><div class="highlight"><pre>
72-
<span></span><span class="kn">import</span> <span class="nn">pytest</span>
72+
<span></span><span class="kn">import</span> <span class="nn">os</span>
73+
<span class="kn">import</span> <span class="nn">pytest</span>
7374
<span class="kn">from</span> <span class="nn">sqlobject</span> <span class="k">import</span> <span class="n">SQLObject</span><span class="p">,</span> <span class="n">StringCol</span>
7475
<span class="kn">from</span> <span class="nn">sqlobject.tests.dbtest</span> <span class="k">import</span> <span class="n">getConnection</span><span class="p">,</span> <span class="n">setupClass</span>
7576

@@ -87,8 +88,10 @@ <h1>Source code for sqlobject.tests.test_postgres</h1><div class="highlight"><pr
8788
<span class="n">setupClass</span><span class="p">(</span><span class="n">SOTestSSLMode</span><span class="p">)</span>
8889
<span class="n">connection</span> <span class="o">=</span> <span class="n">SOTestSSLMode</span><span class="o">.</span><span class="n">_connection</span>
8990
<span class="k">if</span> <span class="p">(</span><span class="n">connection</span><span class="o">.</span><span class="n">dbName</span> <span class="o">!=</span> <span class="s1">&#39;postgres&#39;</span><span class="p">)</span> <span class="ow">or</span> \
90-
<span class="p">(</span><span class="ow">not</span> <span class="n">connection</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">__name__</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s1">&#39;psycopg&#39;</span><span class="p">)):</span>
91-
<span class="n">pytest</span><span class="o">.</span><span class="n">skip</span><span class="p">(</span><span class="s2">&quot;The test requires PostgreSQL, psycopg and ssl mode&quot;</span><span class="p">)</span>
91+
<span class="p">(</span><span class="ow">not</span> <span class="n">connection</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">__name__</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s1">&#39;psycopg&#39;</span><span class="p">))</span> <span class="ow">or</span> \
92+
<span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">name</span> <span class="o">==</span> <span class="s1">&#39;nt&#39;</span><span class="p">):</span>
93+
<span class="n">pytest</span><span class="o">.</span><span class="n">skip</span><span class="p">(</span><span class="s2">&quot;The test requires PostgreSQL, psycopg and ssl mode; &quot;</span>
94+
<span class="s2">&quot;also it doesn&#39;t work on w32&quot;</span><span class="p">)</span>
9295

9396
<span class="n">connection</span> <span class="o">=</span> <span class="n">getConnection</span><span class="p">(</span><span class="n">sslmode</span><span class="o">=</span><span class="s1">&#39;require&#39;</span><span class="p">)</span>
9497
<span class="n">SOTestSSLMode</span><span class="o">.</span><span class="n">_connection</span> <span class="o">=</span> <span class="n">connection</span>

‎devel/_sources/DeveloperGuide.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,11 +257,14 @@ forced to write the test. That's no fun for us, to just be writing
257257
tests. So please, write tests; everything at least needs to be
258258
exercised, even if the tests are absolutely complete.
259259

260-
We now use Travis CI to run tests. See the statuses:
260+
We now use Travis CI and AppVeyor to run tests. See the statuses:
261261

262262
.. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
263263
:target: https://travis-ci.org/sqlobject/sqlobject
264264

265+
.. image:: https://ci.appveyor.com/api/projects/status/github/sqlobject/sqlobject?branch=master
266+
:target: https://ci.appveyor.com/project/phdru/sqlobject
267+
265268
To avoid triggering unnecessary test run at CI services add text `[skip ci]
266269
<https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_ or
267270
``[ci skip]`` anywhere in your commit messages for commits that don't change

‎devel/_sources/News.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,10 @@ Tests
7979
* Run at Travis CI tests with Firebird backend (server version 2.5; drivers fdb
8080
and firebirdsql). There are problems with tests.
8181

82-
* Add appveyor for windows testing. Run tests with Postgres and MS SQL. There
83-
are problems.
82+
* Add AppVeyor for windows testing. Run tests with Postgres and MS SQL. There
83+
are problems with MS SQL.
84+
85+
* Run sqlite tests at AppVeyor.
8486

8587
SQLObject 3.1.0
8688
===============

‎devel/api/sqlobject.tests.test_postgres.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ <h3>Quick search</h3>
183183

184184
<dl class="attribute">
185185
<dt id="sqlobject.tests.test_postgres.SOTestSSLMode.sqlmeta.columnDefinitions">
186-
<code class="descname">columnDefinitions</code><em class="property"> = {'test': &lt;StringCol b408482cL test&gt;}</em><a class="headerlink" href="#sqlobject.tests.test_postgres.SOTestSSLMode.sqlmeta.columnDefinitions" title="Permalink to this definition"></a></dt>
186+
<code class="descname">columnDefinitions</code><em class="property"> = {'test': &lt;StringCol b544594cL test&gt;}</em><a class="headerlink" href="#sqlobject.tests.test_postgres.SOTestSSLMode.sqlmeta.columnDefinitions" title="Permalink to this definition"></a></dt>
187187
<dd></dd></dl>
188188

189189
<dl class="attribute">

‎devel/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /