Skip to content

Commit 02a6121

Browse files
author
Bernhard Mueller
authored
Merge pull request #132 from joshuata/joshuata/compilation
Adds Pipfile and fixes regex compile errors
2 parents 3133fef + 09521c1 commit 02a6121

File tree

8 files changed

+762
-3
lines changed

8 files changed

+762
-3
lines changed

.circleci/config.yml

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ jobs:
3131
name: Unit-testing
3232
command: cd /home/mythril && ./all_tests.sh
3333

34+
- store_test_results:
35+
path: /tmp/test-reports
36+
37+
- store_artifacts:
38+
path: /tmp/test-reports
39+
3440
- run:
3541
name: Ensuring that setup script is functional
3642
command: cd /home/mythril && python3 setup.py install

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ build
88
dist
99
*.rst
1010
*.lock
11+
!Pipfile.lock
1112
*.svg
1213
laser*
1314
lol*
1415
.idea*
1516
coverage_html_report/
1617
.coverage
18+
.pytest_cache
1719
tests/testdata/outputs_current/
1820
tests/mythril_dir/signatures.json

Pipfile

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
[[source]]
2+
url = "https://pypi.python.org/simple"
3+
verify_ssl = true
4+
name = "pypi"
5+
6+
[packages]
7+
requests = "*"
8+
plyvel = "*"
9+
py-solc = "*"
10+
coverage = "*"
11+
BTrees = "*"
12+
ethereum = ">=2.3.0"
13+
zodb = ">=5.3.0"
14+
eth-abi = "*"
15+
"z3-solver" = ">=4.5"
16+
eth-account = "*"
17+
eth-tester = "*"
18+
laser-ethereum = ">=0.5.20"
19+
"jinja2" = "*"
20+
attrs = ">=17.0.0"
21+
22+
[dev-packages]
23+
pylint = "*"
24+
yapf = "*"
25+
pytest = "*"
26+
27+
[requires]
28+
python_version = "3.6"
29+
30+
[pipenv]
31+
allow_prereleases = true

Pipfile.lock

+716
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

all_tests.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ echo "Please make sure you are using solc 0.4.21"
88

99
rm -rf ./tests/testdata/outputs_current/
1010
mkdir -p ./tests/testdata/outputs_current/
11-
python3 -m unittest discover -p "*_test.py"
11+
mkdir -p /tmp/test-reports
12+
pytest --junitxml=/tmp/test-reports/junit.xml

mythril/analysis/modules/dependence_on_predictable_vars.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def execute(statespace):
6666
if "blockhash" in str(constraint):
6767
description = "In the function `" + call.node.function_name + "` "
6868
if "number" in str(constraint):
69-
m = re.search('blockhash\w+(\s\-\s(\d+))*', str(constraint))
69+
m = re.search(r'blockhash\w+(\s-\s(\d+))*', str(constraint))
7070
if m and solve(call):
7171

7272
found = m.group(1)

requirements.txt

+2
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ eth-rlp>=0.1.0
1616
eth-tester>=0.1.0b21
1717
coverage
1818
jinja2
19+
attrs
20+
pytest

setup.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,8 @@
304304
'eth-rlp>=0.1.0',
305305
'eth-tester>=0.1.0b21',
306306
'coverage',
307-
'jinja2'
307+
'jinja2',
308+
'attrs'
308309
],
309310

310311
python_requires='>=3.5',

0 commit comments

Comments
 (0)