Skip to content

Commit

Permalink
deploy: dad702c
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlexanderWells-diamond
AlexanderWells-diamond committed Oct 24, 2023
1 parent 6e81111 commit 3496d36
Show file tree
Hide file tree
Showing 23 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion master/.buildinfo
View file
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: 346d7cfe43e31f28d60aed339fd6e6e6
config: 32b519292b81778488b1942ec76ad27a
tags: 645f666f9bcd5a90fca523b33c5a78b7
Binary file modified master/.doctrees/environment.pickle
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion master/_modules/epicsdbbuilder/recordbase.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>epicsdbbuilder.recordbase &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>epicsdbbuilder.recordbase &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_modules/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Overview: module code &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>Overview: module code &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_modules/softioc/asyncio_dispatcher.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>softioc.asyncio_dispatcher &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>softioc.asyncio_dispatcher &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_modules/softioc/builder.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>softioc.builder &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>softioc.builder &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_modules/softioc/device.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>softioc.device &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>softioc.device &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_modules/softioc/softioc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>softioc.softioc &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>softioc.softioc &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../../_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/_static/documentation_options.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '4.3.0+7.g07b1168',
VERSION: '4.4.0+1.gdad702c',
LANGUAGE: 'None',
COLLAPSE_INDEX: false,
BUILDER: 'html',
Expand Down
18 changes: 9 additions & 9 deletions master/explanations/asyncio-cothread-differences.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>What are the differences between asyncio and cothread? &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>What are the differences between asyncio and cothread? &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
Expand Down Expand Up @@ -98,8 +98,8 @@
<div itemprop="articleBody">

<section id="what-are-the-differences-between-asyncio-and-cothread">
<h1>What are the differences between <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a>?<a class="headerlink" href="#what-are-the-differences-between-asyncio-and-cothread" title="Permalink to this headline"></a></h1>
<p>There are two concurrency frameworks that pythonSoftIOC supports, <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and
<h1>What are the differences between <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a>?<a class="headerlink" href="#what-are-the-differences-between-asyncio-and-cothread" title="Permalink to this headline"></a></h1>
<p>There are two concurrency frameworks that pythonSoftIOC supports, <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and
<a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a>. This page details the differences between them and reasons why you
should use one over the other</p>
<div class="admonition seealso">
Expand All @@ -123,7 +123,7 @@ <h2>The Similarities<a class="headerlink" href="#the-similarities" title="Permal
<h2>The Differences<a class="headerlink" href="#the-differences" title="Permalink to this headline"></a></h2>
<p>The main difference between the libraries is how a coroutine yields control.</p>
<ul class="simple">
<li><p><a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> uses an <code class="docutils literal notranslate"><span class="pre">async</span> <span class="pre">def</span></code> which will yield control when they <code class="docutils literal notranslate"><span class="pre">await</span></code>.
<li><p><a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> uses an <code class="docutils literal notranslate"><span class="pre">async</span> <span class="pre">def</span></code> which will yield control when they <code class="docutils literal notranslate"><span class="pre">await</span></code>.
Only an <code class="docutils literal notranslate"><span class="pre">async</span> <span class="pre">def</span></code> can <code class="docutils literal notranslate"><span class="pre">await</span></code> another <code class="docutils literal notranslate"><span class="pre">async</span> <span class="pre">def</span></code>, so functions that
yield control are explicitly marked as such by the presence of the <code class="docutils literal notranslate"><span class="pre">async</span></code>
keyword.</p></li>
Expand Down Expand Up @@ -171,17 +171,17 @@ <h2>The Differences<a class="headerlink" href="#the-differences" title="Permalin
<h2>Which to use<a class="headerlink" href="#which-to-use" title="Permalink to this headline"></a></h2>
<p>There are some questions to ask to help you choose which one to use:</p>
<ul class="simple">
<li><p>If you run python2.7 then you need to use <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a> as <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> is python3
<li><p>If you run python2.7 then you need to use <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a> as <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> is python3
only</p></li>
<li><p>If you run on Windows then you need <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> as <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a> doesn’t work on
<li><p>If you run on Windows then you need <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> as <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a> doesn’t work on
Windows</p></li>
<li><p>If you need to integrate with a library that uses <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> like one from
<a class="reference external" href="https://github.com/aio-libs">aio-libs</a> then use <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a></p></li>
<li><p>If you need to integrate with a library that uses <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> like one from
<a class="reference external" href="https://github.com/aio-libs">aio-libs</a> then use <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a></p></li>
<li><p>If you need to turn a script using <a class="reference external" href="https://cothread.readthedocs.io/en/stable/catools.html#module-cothread.catools" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread.catools</span></code></a> into an IOC then use
<a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a></p></li>
</ul>
<p>In general, avoid mixing concurrency frameworks if you can. While it is possible
to mix <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a>, it’s messy and tricky to get right. Better to
to mix <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> and <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a>, it’s messy and tricky to get right. Better to
keep to one if possible.</p>
</section>
</section>
Expand Down
4 changes: 2 additions & 2 deletions master/explanations/why-use-pythonSoftIOC.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Why use pythonSoftIOC? &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>Why use pythonSoftIOC? &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
Expand Down Expand Up @@ -137,7 +137,7 @@ <h2>Calculating PVs from other values<a class="headerlink" href="#calculating-pv
</div>
<div class="admonition note">
<p class="admonition-title">Note</p>
<p>If using <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> then you would use <a class="reference external" href="https://dls-controls.github.io/aioca/master/api.html#aioca.camonitor" title="(in aioca v1.7)"><code class="xref any docutils literal notranslate"><span class="pre">aioca.camonitor</span></code></a> instead of
<p>If using <a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> then you would use <a class="reference external" href="https://dls-controls.github.io/aioca/master/api.html#aioca.camonitor" title="(in aioca v1.7)"><code class="xref any docutils literal notranslate"><span class="pre">aioca.camonitor</span></code></a> instead of
<a class="reference external" href="https://cothread.readthedocs.io/en/stable/catools.html#cothread.catools.camonitor" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread.catools.camonitor</span></code></a>:</p>
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="kn">from</span> <span class="nn">aioca</span> <span class="kn">import</span> <span class="n">camonitor</span>
</pre></div>
Expand Down
2 changes: 1 addition & 1 deletion master/genindex.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Index &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>Index &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="_static/theme_overrides.css" type="text/css" />
Expand Down
2 changes: 1 addition & 1 deletion master/how-to/make-publishable-ioc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Create a Publishable IOC &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>Create a Publishable IOC &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
Expand Down
4 changes: 2 additions & 2 deletions master/how-to/read-data-from-ioc.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="utf-8" /><meta name="generator" content="Docutils 0.17.1: http://docutils.sourceforge.net/" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Read data from an IOC &mdash; pythonSoftIOC 4.3.0+7.g07b1168 documentation</title>
<title>Read data from an IOC &mdash; pythonSoftIOC 4.4.0+1.gdad702c documentation</title>
<link rel="stylesheet" href="../_static/pygments.css" type="text/css" />
<link rel="stylesheet" href="../_static/css/theme.css" type="text/css" />
<link rel="stylesheet" href="../_static/theme_overrides.css" type="text/css" />
Expand Down Expand Up @@ -100,7 +100,7 @@
<h1>Read data from an IOC<a class="headerlink" href="#read-data-from-an-ioc" title="Permalink to this headline"></a></h1>
<p>This guide explains how to read data from an IOC in a separate Python program.</p>
<p>To start, run the <a class="reference external" href="https://cothread.readthedocs.io/en/stable/cothread.html#module-cothread" title="(in Cothread)"><code class="xref any docutils literal notranslate"><span class="pre">cothread</span></code></a> IOC from <a class="reference internal" href="../tutorials/creating-an-ioc.html"><span class="doc">Creating an IOC</span></a> or the
<a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.11)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> IOC from <a class="reference internal" href="use-asyncio-in-an-ioc.html"><span class="doc">Use asyncio in an IOC</span></a> and leave it running at the
<a class="reference external" href="https://docs.python.org/3/library/asyncio.html#module-asyncio" title="(in Python v3.12)"><code class="xref any docutils literal notranslate"><span class="pre">asyncio</span></code></a> IOC from <a class="reference internal" href="use-asyncio-in-an-ioc.html"><span class="doc">Use asyncio in an IOC</span></a> and leave it running at the
interactive shell.</p>
<section id="using-channel-access">
<h2>Using Channel Access<a class="headerlink" href="#using-channel-access" title="Permalink to this headline"></a></h2>
Expand Down
Loading

0 comments on commit 3496d36

Please sign in to comment.