Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

select correct /proc/#/status file fields on BSD systems #68

Merged
merged 2 commits into from
Feb 13, 2023

Conversation

jacklag
Copy link
Contributor

@jacklag jacklag commented Jan 9, 2023

BSD system have different fields than Linux systems if they provide a /proc FS
Added a switch to select the correct fields on BSD systems.

@uranusjr
Copy link
Member

Nice! The code can probably be slightly tweaked, but this looks good to me.

@jacklag
Copy link
Contributor Author

jacklag commented Jan 13, 2023

What kind of tweaks you are thinking about?

@uranusjr
Copy link
Member

Oops I meant to do those directly during last weekend but didn’t have the time. I was mostly worried about potentially incompatible systems (e.g. Cygwin) that may not have uname available and looking to make the calculation a bit safer.

@uranusjr uranusjr merged commit 4c2e340 into sarugaku:master Feb 13, 2023
github-actions bot added a commit to MaRDI4NFDI/open-interfaces that referenced this pull request Feb 13, 2023
Bumps [shellingham](https://github.com/sarugaku/shellingham) from
1.5.0.post1 to 1.5.1.
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/sarugaku/shellingham/blob/master/CHANGELOG.rst">shellingham's
changelog</a>.</em></p>
<blockquote>
<h1>1.5.1 (2023-02-13)</h1>
<h2>Bug Fixes</h2>
<ul>
<li>Select the correct status file fields on BSD systems.
<code>[#68](sarugaku/shellingham#68)
&lt;https://github.com/sarugaku/shellingham/issues/68&gt;</code>_</li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/sarugaku/shellingham/commit/0566a5f5ee35f274a5894285107ee053abf5a99f"><code>0566a5f</code></a>
Bump to 1.5.1</li>
<li><a
href="https://github.com/sarugaku/shellingham/commit/d9bb573af0f1c872d2a7c2e58b3a79eb9b9dd140"><code>d9bb573</code></a>
Add missing news fragment</li>
<li><a
href="https://github.com/sarugaku/shellingham/commit/4c2e340e1a5eebe20b56ea4b64e7a3c30e111ed1"><code>4c2e340</code></a>
Merge pull request <a
href="https://github-redirect.dependabot.com/sarugaku/shellingham/issues/68">#68</a>
from jacklag/master</li>
<li><a
href="https://github.com/sarugaku/shellingham/commit/9f422532276c55110be5281458b6cb8dfb395713"><code>9f42253</code></a>
Make uname-checking slightly safer</li>
<li><a
href="https://github.com/sarugaku/shellingham/commit/ce00b8b1e2bd04f9785684ad67a65de19f082cb7"><code>ce00b8b</code></a>
select correct /proc/#/status file fields on BSD systems</li>
<li>See full diff in <a
href="https://github.com/sarugaku/shellingham/compare/1.5.0.post1...1.5.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=shellingham&package-manager=pip&previous-version=1.5.0.post1&new-version=1.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants