Skip to content

Commit

Permalink
Merge pull request #1093 from Simsalabim1234/enable_numpy_2
Browse files Browse the repository at this point in the history
enable numpy 2
  • Loading branch information
danielhrisca authored Nov 18, 2024
2 parents 400e2aa + fb74e8a commit 7520a66
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ When submitting PR's please take into account:

# Testing

You can use tox to run tests locally. Example for the unit tests with Python version 3.7:
You can use tox to run tests locally. Example for the unit tests with Python version 3.10:

```console
tox -e py27
tox -e py310
```

Otherwise, you can just push and the tests will be run by GitHub Actions.
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
canmatrix[arxml,dbc]>=1.0
lz4
numexpr
numpy>=1.23.0, <2.0.0
numpy>=1.23.0
pandas
typing_extensions
python-dateutil
Expand Down
2 changes: 1 addition & 1 deletion src/asammdf/gui/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

_BUILTINS = dict(collections.__builtins__)
for key in ("breakpoint", "compile", "eval", "exec", "input", "open"):
del _BUILTINS[key]
_BUILTINS.pop(key, None)

for module in (bisect, collections, itertools, random, struct, math, pd, np):
if hasattr(module, "__builtins__"):
Expand Down

0 comments on commit 7520a66

Please sign in to comment.