Skip to content

Commit

Permalink
Merge pull request #9 from jacksonllee/remove-QtWebKitWidgets
Browse files Browse the repository at this point in the history
Bug fixes and maintenance; bump version to 5.1.1
  • Loading branch information
jacksonllee committed Mar 5, 2017
2 parents 564a894 + e493c13 commit 3ed4f5e
Show file tree
Hide file tree
Showing 35 changed files with 146 additions and 111 deletions.
2 changes: 1 addition & 1 deletion docs/.buildinfo
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: cb7fc4d49f94133fdfc0e57548a1f952
config: e36ab2c197a1cb3e09d03f0a45e95498
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified docs/.doctrees/cli.doctree
Binary file not shown.
Binary file modified docs/.doctrees/codebase.doctree
Binary file not shown.
Binary file modified docs/.doctrees/data.doctree
Binary file not shown.
Binary file modified docs/.doctrees/demo.doctree
Binary file not shown.
Binary file modified docs/.doctrees/dev.doctree
Binary file not shown.
Binary file modified docs/.doctrees/download.doctree
Binary file not shown.
Binary file modified docs/.doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/.doctrees/gui.doctree
Binary file not shown.
Binary file modified docs/.doctrees/index.doctree
Binary file not shown.
Binary file modified docs/.doctrees/lexicon.doctree
Binary file not shown.
Binary file modified docs/.doctrees/read.doctree
Binary file not shown.
14 changes: 7 additions & 7 deletions docs/cli.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Command line interface (CLI) &mdash; Linguistica 5.1.0 documentation</title>
<title>Command line interface (CLI) &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Full API documentation" href="lexicon.html"/>
<link rel="prev" title="Graphical user interface (GUI)" href="gui.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -137,15 +137,15 @@
<div class="section" id="command-line-interface-cli">
<span id="cli"></span><h1>Command line interface (CLI)<a class="headerlink" href="#command-line-interface-cli" title="Permalink to this headline"></a></h1>
<p>To launch the Linguistica CLI:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ python3 -m linguistica cli
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ linguistica cli
</pre></div>
</div>
<p>The command line interface works for either a corpus text file or a wordlist
file. Parameter changes are supported. Results are saved as text files.</p>
<p>A sample CLI session,
with a corpus text file as input and default settings for all parameters and
options:</p>
<div class="highlight-default"><div class="highlight"><pre><span></span>$ python3 -m linguistica cli
<div class="highlight-default"><div class="highlight"><pre><span></span>$ linguistica cli

================================================================
Welcome to Linguistica 5.1.0-dev!
Expand Down Expand Up @@ -247,7 +247,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -269,7 +269,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
10 changes: 5 additions & 5 deletions docs/codebase.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Codebase &mdash; Linguistica 5.1.0 documentation</title>
<title>Codebase &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="prev" title="For developers" href="dev.html"/>


Expand Down Expand Up @@ -60,7 +60,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -508,7 +508,7 @@ <h2><code class="docutils literal"><span class="pre">linguistica/fsm.py</span></
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -530,7 +530,7 @@ <h2><code class="docutils literal"><span class="pre">linguistica/fsm.py</span></
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
10 changes: 5 additions & 5 deletions docs/data.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Data &mdash; Linguistica 5.1.0 documentation</title>
<title>Data &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Python library" href="read.html"/>
<link rel="prev" title="Quick demonstration" href="demo.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -258,7 +258,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -280,7 +280,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
10 changes: 5 additions & 5 deletions docs/demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Quick demonstration &mdash; Linguistica 5.1.0 documentation</title>
<title>Quick demonstration &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Data" href="data.html"/>
<link rel="prev" title="Download and install" href="download.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -323,7 +323,7 @@ <h3>(2) Signatures to stems<a class="headerlink" href="#signatures-to-stems" tit
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -345,7 +345,7 @@ <h3>(2) Signatures to stems<a class="headerlink" href="#signatures-to-stems" tit
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
10 changes: 5 additions & 5 deletions docs/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>For developers &mdash; Linguistica 5.1.0 documentation</title>
<title>For developers &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Codebase" href="codebase.html"/>
<link rel="prev" title="Full API documentation" href="lexicon.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -412,7 +412,7 @@ <h2>Committing changes and making a pull request<a class="headerlink" href="#com
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -434,7 +434,7 @@ <h2>Committing changes and making a pull request<a class="headerlink" href="#com
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
19 changes: 12 additions & 7 deletions docs/download.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Download and install &mdash; Linguistica 5.1.0 documentation</title>
<title>Download and install &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Quick demonstration" href="demo.html"/>
<link rel="prev" title="Linguistica 5" href="index.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -145,10 +145,15 @@
consider using the Python distribution <a class="reference external" href="https://www.continuum.io/downloads">Anaconda</a>
(or <a class="reference external" href="http://conda.pydata.org/miniconda.html">Miniconda</a>)
with these dependencies installed.</p>
<p>To use the graphical user interface, PyQt5 and SIP are required:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ pip install sip PyQt5
<p>To use the graphical user interface, PyQt5 and SIP are required.
PyQt5 is readily available from <code class="docutils literal"><span class="pre">pip</span></code>:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ pip install PyQt5
</pre></div>
</div>
<p>At the time of writing (March 2017), SIP is best downloaded and installed from
<a class="reference external" href="http://pyqt.sourceforge.net/Docs/sip4/installation.html">its source</a>.
(SIP is available through <code class="docutils literal"><span class="pre">pip</span></code>, but it does not include
the C/C++ code generator for PyQt5.)</p>
<p>To test the installation:</p>
<div class="highlight-python"><div class="highlight"><pre><span></span><span class="gp">&gt;&gt;&gt; </span><span class="kn">import</span> <span class="nn">linguistica</span> <span class="kn">as</span> <span class="nn">lxa</span>
<span class="gp">&gt;&gt;&gt; </span><span class="n">lxa</span><span class="o">.</span><span class="n">__version__</span> <span class="c1"># show version number</span>
Expand Down Expand Up @@ -176,7 +181,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -198,7 +203,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down
12 changes: 6 additions & 6 deletions docs/gui.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0">

<title>Graphical user interface (GUI) &mdash; Linguistica 5.1.0 documentation</title>
<title>Graphical user interface (GUI) &mdash; Linguistica 5.1.1 documentation</title>



Expand All @@ -31,7 +31,7 @@


<link rel="search" title="Search" href="search.html"/>
<link rel="top" title="Linguistica 5.1.0 documentation" href="index.html"/>
<link rel="top" title="Linguistica 5.1.1 documentation" href="index.html"/>
<link rel="next" title="Command line interface (CLI)" href="cli.html"/>
<link rel="prev" title="Python library" href="read.html"/>

Expand Down Expand Up @@ -61,7 +61,7 @@


<div class="version">
5.1.0
5.1.1
</div>


Expand Down Expand Up @@ -137,7 +137,7 @@
<div class="section" id="graphical-user-interface-gui">
<span id="gui"></span><h1>Graphical user interface (GUI)<a class="headerlink" href="#graphical-user-interface-gui" title="Permalink to this headline"></a></h1>
<p>To launch the Linguistica GUI:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ python3 -m linguistica gui
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ linguistica gui
</pre></div>
</div>
<p>To read an input file, go to <strong>File</strong>, then:</p>
Expand Down Expand Up @@ -172,7 +172,7 @@
<div role="contentinfo">
<p>
&copy; Copyright 2015-2017, Jackson Lee.
Last updated on Jan 01, 2017.
Last updated on Mar 04, 2017.

</p>
</div>
Expand All @@ -194,7 +194,7 @@
<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT:'./',
VERSION:'5.1.0',
VERSION:'5.1.1',
COLLAPSE_INDEX:false,
FILE_SUFFIX:'.html',
HAS_SOURCE: true
Expand Down

0 comments on commit 3ed4f5e

Please sign in to comment.