Skip to content

Commit 69b1dd9

Browse files
committed
Merge master into feature
2 parents 00f61f4 + 765368d commit 69b1dd9

File tree

76 files changed

+8137
-6950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+8137
-6950
lines changed

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 3.3.0
2+
current_version = 3.4.0
33
commit = False
44
tag = False
55

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ CoreMS aims to provide
4949

5050
## Current Version
5151

52-
`3.3.0`
52+
`3.4.0`
5353

5454
***
5555

@@ -336,11 +336,11 @@ UML (unified modeling language) diagrams for Direct Infusion FT-MS and GC-MS cla
336336
337337
If you use CoreMS in your work, please use the following citation:
338338
339-
Version [3.3.0 Release on GitHub](https://github.com/EMSL-Computing/CoreMS/releases/tag/v3.3.0), archived on Zenodo:
339+
Version [3.4.0 Release on GitHub](https://github.com/EMSL-Computing/CoreMS/releases/tag/v3.4.0), archived on Zenodo:
340340
341341
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.14009575.svg)](https://doi.org/10.5281/zenodo.14009575)
342342
343-
Yuri E. Corilo, William R. Kew, Lee Ann McCue, Katherine R . Heal, James C. Carr (2024, October 29). EMSL-Computing/CoreMS: CoreMS 3.3.0 (Version v3.3.0), as developed on Github. Zenodo. http://doi.org/10.5281/zenodo.14009575
343+
Yuri E. Corilo, William R. Kew, Lee Ann McCue, Katherine R . Heal, James C. Carr (2024, October 29). EMSL-Computing/CoreMS: CoreMS 3.4.0 (Version v3.4.0), as developed on Github. Zenodo. http://doi.org/10.5281/zenodo.14009575
344344
345345
```
346346

corems/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = "Yuri E. Corilo"
2-
__version__ = "3.3.0"
2+
__version__ = "3.4.0"
33
import time
44
import os
55
import sys

docs/corems.html

Lines changed: 31 additions & 29 deletions
Large diffs are not rendered by default.

docs/corems/chroma_peak/calc/ChromaPeakCalc.html

Lines changed: 27 additions & 27 deletions
Large diffs are not rendered by default.

docs/corems/chroma_peak/factory/chroma_peak_classes.html

Lines changed: 106 additions & 106 deletions
Large diffs are not rendered by default.

docs/corems/encapsulation/constant.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ <h1 class="modulename">
150150

151151
<label class="view-source-button" for="mod-constant-view-source"><span>View Source</span></label>
152152

153-
<div class="pdoc-code codehilite"><pre><span></span><span id="L-1"><a href="#L-1"><span class="linenos"> 1</span></a><span class="k">class</span> <span class="nc">Labels</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
153+
<div class="pdoc-code codehilite"><pre><span></span><span id="L-1"><a href="#L-1"><span class="linenos"> 1</span></a><span class="k">class</span><span class="w"> </span><span class="nc">Labels</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
154154
</span><span id="L-2"><a href="#L-2"><span class="linenos"> 2</span></a><span class="w"> </span><span class="sd">&quot;&quot;&quot;Class for Labels used in CoreMS</span>
155155
</span><span id="L-3"><a href="#L-3"><span class="linenos"> 3</span></a>
156156
</span><span id="L-4"><a href="#L-4"><span class="linenos"> 4</span></a><span class="sd"> These labels are used to define:</span>
@@ -195,7 +195,7 @@ <h1 class="modulename">
195195
</span><span id="L-43"><a href="#L-43"><span class="linenos"> 43</span></a> <span class="p">}</span>
196196
</span><span id="L-44"><a href="#L-44"><span class="linenos"> 44</span></a>
197197
</span><span id="L-45"><a href="#L-45"><span class="linenos"> 45</span></a>
198-
</span><span id="L-46"><a href="#L-46"><span class="linenos"> 46</span></a><span class="k">class</span> <span class="nc">Atoms</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
198+
</span><span id="L-46"><a href="#L-46"><span class="linenos"> 46</span></a><span class="k">class</span><span class="w"> </span><span class="nc">Atoms</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
199199
</span><span id="L-47"><a href="#L-47"><span class="linenos"> 47</span></a><span class="w"> </span><span class="sd">&quot;&quot;&quot;Class for Atoms in CoreMS</span>
200200
</span><span id="L-48"><a href="#L-48"><span class="linenos"> 48</span></a>
201201
</span><span id="L-49"><a href="#L-49"><span class="linenos"> 49</span></a><span class="sd"> This class includes key properties of atoms (and the electron) and isotopes, including their exact masses, relative abundances, and covalences.</span>
@@ -1448,7 +1448,7 @@ <h1 class="modulename">
14481448

14491449
</div>
14501450
<a class="headerlink" href="#Labels"></a>
1451-
<div class="pdoc-code codehilite"><pre><span></span><span id="Labels-2"><a href="#Labels-2"><span class="linenos"> 2</span></a><span class="k">class</span> <span class="nc">Labels</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
1451+
<div class="pdoc-code codehilite"><pre><span></span><span id="Labels-2"><a href="#Labels-2"><span class="linenos"> 2</span></a><span class="k">class</span><span class="w"> </span><span class="nc">Labels</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
14521452
</span><span id="Labels-3"><a href="#Labels-3"><span class="linenos"> 3</span></a><span class="w"> </span><span class="sd">&quot;&quot;&quot;Class for Labels used in CoreMS</span>
14531453
</span><span id="Labels-4"><a href="#Labels-4"><span class="linenos"> 4</span></a>
14541454
</span><span id="Labels-5"><a href="#Labels-5"><span class="linenos"> 5</span></a><span class="sd"> These labels are used to define:</span>
@@ -1795,7 +1795,7 @@ <h1 class="modulename">
17951795

17961796
</div>
17971797
<a class="headerlink" href="#Atoms"></a>
1798-
<div class="pdoc-code codehilite"><pre><span></span><span id="Atoms-47"><a href="#Atoms-47"><span class="linenos"> 47</span></a><span class="k">class</span> <span class="nc">Atoms</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
1798+
<div class="pdoc-code codehilite"><pre><span></span><span id="Atoms-47"><a href="#Atoms-47"><span class="linenos"> 47</span></a><span class="k">class</span><span class="w"> </span><span class="nc">Atoms</span><span class="p">:</span> <span class="c1"># pragma: no cover</span>
17991799
</span><span id="Atoms-48"><a href="#Atoms-48"><span class="linenos"> 48</span></a><span class="w"> </span><span class="sd">&quot;&quot;&quot;Class for Atoms in CoreMS</span>
18001800
</span><span id="Atoms-49"><a href="#Atoms-49"><span class="linenos"> 49</span></a>
18011801
</span><span id="Atoms-50"><a href="#Atoms-50"><span class="linenos"> 50</span></a><span class="sd"> This class includes key properties of atoms (and the electron) and isotopes, including their exact masses, relative abundances, and covalences.</span>

0 commit comments

Comments
 (0)