Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
scapy
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
CodeLinaro
public-release-test-restored
platform
external
scapy
Commits
149791c5
Commit
149791c5
authored
8 years ago
by
Pierre LALET
Browse files
Options
Downloads
Patches
Plain Diff
Fix cyrptography install for Travis-CI tests with PyPy
parent
8390dc2f
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis/install.sh
+25
-1
25 additions, 1 deletion
.travis/install.sh
.travis/test.sh
+11
-0
11 additions, 0 deletions
.travis/test.sh
with
36 additions
and
1 deletion
.travis/install.sh
+
25
−
1
View file @
149791c5
...
@@ -7,7 +7,31 @@ then
...
@@ -7,7 +7,31 @@ then
PIP_INSTALL_FLAGS
=
"--user"
PIP_INSTALL_FLAGS
=
"--user"
fi
fi
fi
fi
$SCAPY_SUDO
pip
install
$PIP_INSTALL_FLAGS
cryptography ecdsa mock
if
python
--version
2>&1 |
grep
-q
PyPy
;
then
wget https://pypi.python.org/packages/82/f7/d6dfd7595910a20a563a83a762bf79a253c4df71759c3b228accb3d7e5e4/cryptography-1.7.1.tar.gz
tar
zxf cryptography-1.7.1.tar.gz
cd
cryptography-1.7.1
patch
<<
EOF
--- setup.py
+++ setup.py
@@ -47,7 +47,7 @@ if sys.version_info < (3, 4):
if sys.version_info < (3, 3):
requirements.append("ipaddress")
-if platform.python_implementation() == "PyPy":
+if False:
if sys.pypy_version_info < (2, 6):
raise RuntimeError(
"cryptography 1.0 is not compatible with PyPy < 2.6. Please "
EOF
$SCAPY_SUDO
pip
install
$PIP_INSTALL_FLAGS
.
cd
../
rm
-rf
cryptography-
*
$SCAPY_SUDO
pip
install
$PIP_INSTALL_FLAGS
ecdsa mock
else
$SCAPY_SUDO
pip
install
$PIP_INSTALL_FLAGS
cryptography ecdsa mock
fi
# Install coverage
# Install coverage
if
[
"
$SCAPY_COVERAGE
"
=
"yes"
]
if
[
"
$SCAPY_COVERAGE
"
=
"yes"
]
...
...
This diff is collapsed.
Click to expand it.
.travis/test.sh
+
11
−
0
View file @
149791c5
...
@@ -18,6 +18,12 @@ then
...
@@ -18,6 +18,12 @@ then
UT_FLAGS+
=
" -K combined_modes"
UT_FLAGS+
=
" -K combined_modes"
fi
fi
if
python
--version
2>&1 |
grep
-q
PyPy
then
TRAVIS_PYPY
=
"yes"
UT_FLAGS+
=
" -K wep "
fi
# Set PATH
# Set PATH
for
_path
in
/sbin /usr/sbin /usr/local/sbin
;
do
for
_path
in
/sbin /usr/sbin /usr/local/sbin
;
do
[
-d
"
$_path
"
]
&&
echo
"
$PATH
"
|
grep
-qvE
"(^|:)
$_path
(:|
$)
"
&&
export
PATH
=
"
$PATH
:
$_path
"
[
-d
"
$_path
"
]
&&
echo
"
$PATH
"
|
grep
-qvE
"(^|:)
$_path
(:|
$)
"
&&
export
PATH
=
"
$PATH
:
$_path
"
...
@@ -63,6 +69,11 @@ do
...
@@ -63,6 +69,11 @@ do
then
then
continue
continue
fi
fi
if
[
"
$f
"
=
"cert.uts"
-o
"
$f
"
=
"ipsec.uts"
]
&&
[
"
$TRAVIS_PYPY
"
=
"yes"
]
then
# currently disabled
continue
fi
$SCAPY_SUDO
./run_tests
-q
-F
-t
$f
$UT_FLAGS
||
exit
$?
$SCAPY_SUDO
./run_tests
-q
-F
-t
$f
$UT_FLAGS
||
exit
$?
done
done
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment