Skip to content

Commit

Permalink
v0.5.1,add spidev to requirements, readme updates
Browse files Browse the repository at this point in the history
  • Loading branch information
gutow committed Mar 9, 2023
1 parent 21fc728 commit 51d8b3a
Show file tree
Hide file tree
Showing 14 changed files with 2,996 additions and 2,984 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ install as a special kernel when you are the user.
found [here](https://janakiev.com/til/jupyter-virtual-envs/).

## Change Log
* 0.5.1 (Mar. 9, 2023)
* Include `spidev` package in requirements.
* More details reported when unable to "find trough".
* 0.5.0 (Mar. 4, 2023) First version with working GUI
* 0.1.0 First pypi compatible package version.

Expand All @@ -134,9 +137,8 @@ install as a special kernel when you are the user.
2. Update any `.md` files included in `_init_.py`.
* Generally URLs should be absolute, not relative.
3. At the root level run pdoc `pdoc --logo-link https://gutow.github.
io/Langmuir_Trough/ --footer-text "Langmuir_Trough vX.X.X" --math -html -o
docs Trough_GUI Trough_Control`
where `X.X.X` is the version number.
io/Langmuir_Trough/ --footer-text "Langmuir_Trough vX.X.X" --math -html -o
docs Trough_GUI Trough_Control` where `X.X.X` is the version number.
4. Because of the way the document building process works the background tasks
will be started. **You will have to stop the document build after the
documentation is done building (watch the `doc` folder) with a `^C` to
Expand Down
2 changes: 2 additions & 0 deletions Trough_Control/trough_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ def init_trough():
from piplates import DAQC2plate
del DAQC2plate
except Exception as e:
print("An issue was encountered while accessing the DAQC2plate:" +
str(e))
trough_exists = False
if trough_exists:
TROUGH = Process(target=troughctl, args=(cmdrcv, datasend))
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_Control.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_Control/message_utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_Control/simulation.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2,974 changes: 1,489 additions & 1,485 deletions docs/Trough_Control/trough_util.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Trough_GUI.html
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2,973 changes: 1,488 additions & 1,485 deletions docs/Trough_GUI/Collect_data.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/Trough_GUI/Monitor_Calibrate.html
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_GUI/calibration_utils.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_GUI/command_widgets.html
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_GUI/conversions.html
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
2 changes: 1 addition & 1 deletion docs/Trough_GUI/status_widgets.html
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ <h2>API Documentation</h2>
</ul>


<footer>Langmuir_Trough v0.5.0</footer>
<footer>Langmuir_Trough v0.5.1</footer>

<a class="attribution" title="pdoc: Python API documentation generator" href="https://pdoc.dev" target="_blank">
built with <span class="visually-hidden">pdoc</span><img
Expand Down
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

setuptools.setup(
name="langmuir_trough",
version="0.5.0",
version="0.5.1",
description="Controls and collects data from Gutow Lab Langmuir Trough.",
long_description=long_description,
long_description_content_type="text/markdown",
Expand All @@ -23,7 +23,8 @@
'JPSLMenus>=0.5.0',
'lmfit>=1.0.3',
'round-using-error>=1.1.1',
'RPi.GPIO>=0.7.0;platform_system=="Linux"',
'RPi.GPIO>=0.7.0;platform_system=="Linux"', # pi-plates requires
'spidev>=3.5;platform_system=="Linux"', # pi-plates requires
'pi-plates>=7.21',
'numpy>=1.21',
'plotly>=5.8.2',
Expand Down

0 comments on commit 51d8b3a

Please sign in to comment.