Update devel docs: drop Circle CI

Author: phdru

devel/DeveloperGuide.html

@@ -335,12 +335,11 @@ <h2>Testing<a class="headerlink" href="#testing" title="Permalink to this headli
 forced to write the test.  That&#8217;s no fun for us, to just be writing
 tests.  So please, write tests; everything at least needs to be
 exercised, even if the tests are absolutely complete.</p>
-<p>We now use Travis CI and Circle CI to run tests. See the statuses:</p>
+<p>We now use Travis CI to run tests. See the statuses:</p>
 <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>
-<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>
 <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
-<a class="reference external" href="https://circleci.com/docs/skip-a-build/">[ci skip]</a> anywhere in your commit
-messages for commits that don&#8217;t change code (documentation updates and such).</p>
+<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
+code (documentation updates and such).</p>
 <p>We use <a class="reference external" href="https://pypi.python.org/pypi/coverage">coverage.py</a>
 to measures code coverage by tests and upload the result for analyzis to
 <a class="reference external" href="https://coveralls.io/github/sqlobject/sqlobject">Coveralls</a> and

devel/News.html

@@ -181,7 +181,7 @@ <h3>Drivers (work in progress)<a class="headerlink" href="#drivers-work-in-progr
 <li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/py-postgresql">py-postgresql</a> PostgreSQL driver. There
 are still problems with the driver.</li>
 <li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/pg8000">pg8000</a>
-PostgreSQL driver. There are still some problems.</li>
+PostgreSQL driver. There are major problems with the driver.</li>
 <li>Add support for <a class="reference external" href="https://pypi.python.org/pypi/firebirdsql">pyfirebirdsql</a> (untested).</li>
 </ul>
 </div>
@@ -202,7 +202,7 @@ <h3>Tests<a class="headerlink" href="#tests" title="Permalink to this headline">
 <li>Fix <code class="docutils literal"><span class="pre">pytest</span></code> warnings by converting yield tests to plain calls: yield
 tests were deprecated in <code class="docutils literal"><span class="pre">pytest</span></code>.</li>
 <li>Tests are now run at CIs with <code class="docutils literal"><span class="pre">python3.5</span></code>.</li>
-<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>
+<li>Drop <code class="docutils literal"><span class="pre">Circle</span> <span class="pre">CI</span></code>.</li>
 </ul>
 </div>
 </div>

devel/_modules/sqlobject/mysql/mysqlconnection.html

@@ -172,6 +172,7 @@ <h1>Source code for sqlobject.mysql.mysqlconnection</h1><div class="highlight"><
             <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>
         <span class="k">else</span><span class="p">:</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span> <span class="o">=</span> <span class="kc">None</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">driver</span> <span class="o">=</span> <span class="n">driver</span>
 
         <span class="k">global</span> <span class="n">mysql_Bin</span>
         <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"><
 <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>
         <span class="n">dbEncoding</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbEncoding</span>
         <span class="k">if</span> <span class="n">dbEncoding</span><span class="p">:</span>
-            <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> <span class="o">==</span> <span class="s1">&#39;MySQLdb&#39;</span><span class="p">:</span>
+            <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><span class="p">()</span> <span class="ow">in</span> <span class="p">(</span><span class="s1">&#39;mysqldb&#39;</span><span class="p">,</span> <span class="s1">&#39;pymysql&#39;</span><span class="p">):</span>
                 <span class="kn">from</span> <span class="nn">MySQLdb.connections</span> <span class="k">import</span> <span class="n">Connection</span>
                 <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>
                     <span class="c1"># monkeypatch pre MySQLdb 1.2.1</span>
                     <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>
                         <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>
                     <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>
-        <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> <span class="o">==</span> <span class="s1">&#39;mysql.connector&#39;</span><span class="p">:</span>
+        <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>
             <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>
         <span class="k">try</span><span class="p">:</span>
             <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>
                 <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>
                 <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>
-            <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> <span class="o">!=</span> <span class="s1">&#39;oursql&#39;</span><span class="p">:</span>
+            <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>
                 <span class="c1"># Attempt to reconnect. This setting is persistent.</span>
                 <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>
         <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"><
 
         <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>
 
-        <span class="k">if</span> <span class="n">dbEncoding</span> <span class="ow">and</span> <span class="bp">self</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="s1">&#39;MySQLdb&#39;</span><span class="p">:</span>
-            <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>  <span class="c1"># MySQLdb 1.2.1 and later</span>
+        <span class="k">if</span> <span class="n">dbEncoding</span><span class="p">:</span>
+            <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>
                 <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>
-            <span class="k">else</span><span class="p">:</span>  <span class="c1"># pre MySQLdb 1.2.1</span>
+            <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>
+                <span class="n">conn</span><span class="o">.</span><span class="n">charset</span> <span class="o">=</span> <span class="n">dbEncoding</span>
+            <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>
                 <span class="c1"># works along with monkeypatching code above</span>
                 <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>
 

devel/_sources/DeveloperGuide.txt

@@ -257,18 +257,15 @@ forced to write the test.  That's no fun for us, to just be writing
 tests.  So please, write tests; everything at least needs to be
 exercised, even if the tests are absolutely complete.
 
-We now use Travis CI and Circle CI to run tests. See the statuses:
+We now use Travis CI to run tests. See the statuses:
 
 .. image:: https://travis-ci.org/sqlobject/sqlobject.svg?branch=master
    :target: https://travis-ci.org/sqlobject/sqlobject
 
-.. image:: https://circleci.com/gh/sqlobject/sqlobject.svg?style=shield
-   :target: https://circleci.com/gh/sqlobject/sqlobject
-
 To avoid triggering unnecessary test run at CI services add text `[skip ci]
 <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_ or
-`[ci skip] <https://circleci.com/docs/skip-a-build/>`_ anywhere in your commit
-messages for commits that don't change code (documentation updates and such).
+``[ci skip]`` anywhere in your commit messages for commits that don't change
+code (documentation updates and such).
 
 We use `coverage.py <https://pypi.python.org/pypi/coverage>`_
 to measures code coverage by tests and upload the result for analyzis to

devel/_sources/News.txt

@@ -52,7 +52,7 @@ Drivers (work in progress)
   are still problems with the driver.
 
 * Add support for `pg8000 <https://pypi.python.org/pypi/pg8000>`_
-  PostgreSQL driver. There are still some problems.
+  PostgreSQL driver. There are major problems with the driver.
 
 * Add support for `pyfirebirdsql
   <https://pypi.python.org/pypi/firebirdsql>`_ (untested).
@@ -78,7 +78,7 @@ Tests
 
 * Tests are now run at CIs with ``python3.5``.
 
-* Tests are split at ``Circle CI`` in 4 parallel containers.
+* Drop ``Circle CI``.
 
 SQLObject 3.1.0
 ===============