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 5beb66d

Browse files
committed
Update devel docs: drop Circle CI
1 parent f75140f commit 5beb66d

File tree

6 files changed

+20
-21
lines changed

6 files changed

+20
-21
lines changed

‎devel/DeveloperGuide.html‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,12 +335,11 @@ <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 and Circle CI to run tests. See the statuses:</p>
338+
<p>We now use Travis CI 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://circleci.com/gh/sqlobject/sqlobject"><img alt="https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield" src="https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield" /></a>
341340
<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
342-
<a class="reference external" href="https://circleci.com/docs/skip-a-build/">[ciskip]</a> anywhere in your commit
343-
messages for commits that don&#8217;t change code (documentation updates and such).</p>
341+
<code class="docutils literal"><spanclass="pre">[ci</span><spanclass="pre">skip]</span></code> anywhere in your commit messages for commits that don&#8217;t change
342+
code (documentation updates and such).</p>
344343
<p>We use <a class="reference external" href="https://pypi.python.org/pypi/coverage">coverage.py</a>
345344
to measures code coverage by tests and upload the result for analyzis to
346345
<a class="reference external" href="https://coveralls.io/github/sqlobject/sqlobject">Coveralls</a> and

‎devel/News.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ <h3>Drivers (work in progress)<a class="headerlink" href="#drivers-work-in-progr
181181
<li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/py-postgresql">py-postgresql</a> PostgreSQL driver. There
182182
are still problems with the driver.</li>
183183
<li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/pg8000">pg8000</a>
184-
PostgreSQL driver. There are still some problems.</li>
184+
PostgreSQL driver. There are major problems with the driver.</li>
185185
<li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/firebirdsql">pyfirebirdsql</a> (untested).</li>
186186
</ul>
187187
</div>
@@ -202,7 +202,7 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
202202
<li>Fix <code class="docutils literal"><span class="pre">pytest</span></code> warnings by converting yield tests to plain calls: yield
203203
tests were deprecated in <code class="docutils literal"><span class="pre">pytest</span></code>.</li>
204204
<li>Tests are now run at CIs with <code class="docutils literal"><span class="pre">python3.5</span></code>.</li>
205-
<li>Tests are split at <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code> in 4 parallel containers.</li>
205+
<li>Drop <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code>.</li>
206206
</ul>
207207
</div>
208208
</div>

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
172172
<span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">kw</span><span class="p">[</span><span class="s2">&quot;charset&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">kw</span><span class="o">.</span><span class="n">pop</span><span class="p">(</span><span class="s2">&quot;charset&quot;</span><span class="p">)</span>
173173
<span class="k">else</span><span class="p">:</span>
174174
<span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span> <span class="o">=</span> <span class="kc">None</span>
175+
<span class="bp">self</span><span class="o">.</span><span class="n">driver</span> <span class="o">=</span> <span class="n">driver</span>
175176

176177
<span class="k">global</span> <span class="n">mysql_Bin</span>
177178
<span class="k">if</span> <span class="ow">not</span> <span class="n">PY2</span> <span class="ow">and</span> <span class="n">mysql_Bin</span> <span class="ow">is</span> <span class="kc">None</span><span class="p">:</span>
@@ -192,20 +193,20 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
192193
<div class="viewcode-block" id="MySQLConnection.makeConnection"><a class="viewcode-back" href="../../../api/sqlobject.mysql.mysqlconnection.html#sqlobject.mysql.mysqlconnection.MySQLConnection.makeConnection">[docs]</a> <span class="k">def</span> <span class="nf">makeConnection</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
193194
<span class="n">dbEncoding</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span>
194195
<span class="k">if</span> <span class="n">dbEncoding</span><span class="p">:</span>
195-
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">__name__</span><spanclass="o">==</span><spanclass="s1">&#39;MySQLdb&#39;</span><span class="p">:</span>
196+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">driver</span><span class="o">.</span><span class="n">lower</span><spanclass="p">()</span><spanclass="ow">in</span><spanclass="p">(</span><spanclass="s1">&#39;mysqldb&#39;</span><spanclass="p">,</span><spanclass="s1">&#39;pymysql&#39;</span><span class="p">):</span>
196197
<span class="kn">from</span> <span class="nn">MySQLdb.connections</span> <span class="k">import</span> <span class="n">Connection</span>
197198
<span class="k">if</span> <span class="ow">not</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">Connection</span><span class="p">,</span> <span class="s1">&#39;set_character_set&#39;</span><span class="p">):</span>
198199
<span class="c1"># monkeypatch pre MySQLdb 1.2.1</span>
199200
<span class="k">def</span> <span class="nf">character_set_name</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
200201
<span class="k">return</span> <span class="n">dbEncoding</span> <span class="o">+</span> <span class="s1">&#39;_&#39;</span> <span class="o">+</span> <span class="n">dbEncoding</span>
201202
<span class="n">Connection</span><span class="o">.</span><span class="n">character_set_name</span> <span class="o">=</span> <span class="n">character_set_name</span>
202-
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">module</span><spanclass="o">.</span><span class="n">__name__</span><spanclass="o">==</span> <span class="s1">&#39;mysql.connector&#39;</span><span class="p">:</span>
203+
<span class="k">if</span> <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>
203204
<span class="bp">self</span><span class="o">.</span><span class="n">kw</span><span class="p">[</span><span class="s1">&#39;consume_results&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="kc">True</span>
204205
<span class="k">try</span><span class="p">:</span>
205206
<span class="n">conn</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">connect</span><span class="p">(</span>
206207
<span class="n">host</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">host</span><span class="p">,</span> <span class="n">port</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">port</span><span class="p">,</span> <span class="n">db</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">db</span><span class="p">,</span>
207208
<span class="n">user</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">user</span><span class="p">,</span> <span class="n">passwd</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">password</span><span class="p">,</span> <span class="o">**</span><span class="bp">self</span><span class="o">.</span><span class="n">kw</span><span class="p">)</span>
208-
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">module</span><spanclass="o">.</span><spanclass="n">__name__</span> <span class="o">!=</span> <span class="s1">&#39;oursql&#39;</span><span class="p">:</span>
209+
<span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">driver</span> <span class="o">!=</span> <span class="s1">&#39;oursql&#39;</span><span class="p">:</span>
209210
<span class="c1"># Attempt to reconnect. This setting is persistent.</span>
210211
<span class="n">conn</span><span class="o">.</span><span class="n">ping</span><span class="p">(</span><span class="kc">True</span><span class="p">)</span>
211212
<span class="k">except</span> <span class="bp">self</span><span class="o">.</span><span class="n">module</span><span class="o">.</span><span class="n">OperationalError</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
@@ -216,10 +217,12 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
216217

217218
<span class="bp">self</span><span class="o">.</span><span class="n">_setAutoCommit</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="nb">bool</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">autoCommit</span><span class="p">))</span>
218219

219-
<span class="k">if</span> <span class="n">dbEncoding</span><spanclass="ow">and</span><spanclass="bp">self</span><spanclass="o">.</span><spanclass="n">module</span><spanclass="o">.</span><spanclass="n">__name__</span><spanclass="o">==</span><spanclass="s1">&#39;MySQLdb&#39;</span><span class="p">:</span>
220-
<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="s1">&#39;set_character_set&#39;</span><span class="p">):</span><spanclass="c1"># MySQLdb 1.2.1 and later</span>
220+
<span class="k">if</span> <span class="n">dbEncoding</span><span class="p">:</span>
221+
<span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="s1">&#39;set_character_set&#39;</span><span class="p">):</span>
221222
<span class="n">conn</span><span class="o">.</span><span class="n">set_character_set</span><span class="p">(</span><span class="n">dbEncoding</span><span class="p">)</span>
222-
<span class="k">else</span><span class="p">:</span> <span class="c1"># pre MySQLdb 1.2.1</span>
223+
<span class="k">elif</span> <span class="bp">self</span><span class="o">.</span><span class="n">driver</span> <span class="o">==</span> <span class="s1">&#39;oursql&#39;</span><span class="p">:</span>
224+
<span class="n">conn</span><span class="o">.</span><span class="n">charset</span> <span class="o">=</span> <span class="n">dbEncoding</span>
225+
<span class="k">elif</span> <span class="nb">hasattr</span><span class="p">(</span><span class="n">conn</span><span class="p">,</span> <span class="s1">&#39;query&#39;</span><span class="p">):</span>
223226
<span class="c1"># works along with monkeypatching code above</span>
224227
<span class="n">conn</span><span class="o">.</span><span class="n">query</span><span class="p">(</span><span class="s2">&quot;SET NAMES </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">dbEncoding</span><span class="p">)</span>
225228

‎devel/_sources/DeveloperGuide.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -257,18 +257,15 @@ 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 and Circle CI to run tests. See the statuses:
260+
We now use Travis CI 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://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
266-
:target: https://circleci.com/gh/sqlobject/sqlobject
267-
268265
To avoid triggering unnecessary test run at CI services add text `[skip ci]
269266
<https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_ or
270-
`[ci skip] <https://circleci.com/docs/skip-a-build/>`_ anywhere in your commit
271-
messages for commits that don't change code (documentation updates and such).
267+
``[ci skip]`` anywhere in your commit messages for commits that don't change
268+
code (documentation updates and such).
272269

273270
We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
274271
to measures code coverage by tests and upload the result for analyzis to

‎devel/_sources/News.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Drivers (work in progress)
5252
are still problems with the driver.
5353

5454
* Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
55-
PostgreSQL driver. There are still some problems.
55+
PostgreSQL driver. There are major problems with the driver.
5656

5757
* Add support for `pyfirebirdsql
5858
<https://pypi.python.org/pypi/firebirdsql>`_ (untested).
@@ -78,7 +78,7 @@ Tests
7878

7979
* Tests are now run at CIs with ``python3.5``.
8080

81-
* Tests are split at ``Circle CI`` in 4 parallel containers.
81+
* Drop ``Circle CI``.
8282

8383
SQLObject 3.1.0
8484
===============

‎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 によって変換されたページ (->オリジナル) /