Skip to content

Commit

Permalink
Merge pull request #570 from enzbang/ramonat-rlimit-for-macos-m2
Browse files Browse the repository at this point in the history
Complete support for macOS M2
  • Loading branch information
enzbang authored Mar 17, 2023
2 parents 8eebcb2 + 113d97f commit 142691e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 4 deletions.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@

* Nothing

# Version 22.3.1 (2023-03-17)

* Add rlimit binary for aarch64-darwin

# Version 22.3.0 (2023-03-09)

* Add support for M1/M2 MacOS (aarch64-darwin platform)
Expand Down
9 changes: 8 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,14 @@
"stevedore>1.20.0",
]

extras_require = {"config": ["tomlkit", "typeguard"], "test": ["pytest-socket"]}
extras_require = {
"config": [
"tomlkit",
# There are some backward incompatible checks in typeguard 3.x
"typeguard<3.0.0",
],
"test": ["pytest-socket"],
}

for p in ("darwin", "linux", "linux2", "win32"):
platform_string = ":sys_platform=='%s'" % p
Expand Down
2 changes: 0 additions & 2 deletions src/e3/json.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
"""Utility functions related to json."""


from __future__ import annotations

import json
Expand Down
Binary file added src/e3/os/data/rlimit-aarch64-darwin
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/coverage/base.rc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ branch = False
# we can probably activate it once we have more coverage

[report]
fail_under = 94
fail_under = 90
omit =
*mypy.py
exclude_lines =
Expand Down

0 comments on commit 142691e

Please sign in to comment.