Skip to content

Commit 7bd185d

Browse files
committed
Just remove nghttp2 support.
1 parent 873c65a commit 7bd185d

File tree

4 files changed

+0
-171
lines changed

4 files changed

+0
-171
lines changed

.travis.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,6 @@ python:
99
- "3.5"
1010
- pypy
1111

12-
env:
13-
- NGHTTP2=true
14-
- NGHTTP2=
15-
16-
matrix:
17-
exclude:
18-
- env: NGHTTP2=true
19-
python: pypy
20-
2112
install:
2213
- ".travis/install.sh"
2314
before_script: "flake8 hpack test"

.travis/install.sh

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,6 @@
33
set -e
44
set -x
55

6-
if [[ "$NGHTTP2" = true ]]; then
7-
# GCC 4.6 seems to cause problems, so go straight to 4.8.
8-
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
9-
sudo apt-get update
10-
sudo apt-get install g++-4.8 libstdc++-4.8-dev
11-
export CXX="g++-4.8" CC="gcc-4.8"
12-
$CC --version
13-
14-
# Install nghttp2. Right now I haven't built a PPA for this so we have to
15-
# do it from source, which kinda sucks. First, install a ton of
16-
# prerequisite packages.
17-
sudo apt-get install autoconf automake autotools-dev libtool pkg-config \
18-
zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \
19-
libevent-dev libjansson-dev libjemalloc-dev
20-
pip install cython
21-
22-
# Now, download and install nghttp2's latest version.
23-
git clone https://github.com/tatsuhiro-t/nghttp2.git
24-
cd nghttp2
25-
DIR=`pwd`
26-
export PYTHONPATH="$DIR/lib/python${TRAVIS_PYTHON_VERSION}/site-packages"
27-
mkdir -p $PYTHONPATH
28-
autoreconf -i
29-
automake
30-
autoconf
31-
./configure --disable-threads --prefix=`pwd`
32-
make
33-
make install
34-
35-
# The makefile doesn't install into the active virtualenv. Install again.
36-
cd python
37-
python setup.py install
38-
cd ../..
39-
40-
# Let's try ldconfig.
41-
sudo sh -c 'echo "/usr/local/lib" > /etc/ld.so.conf.d/libnghttp2.conf'
42-
sudo ldconfig
43-
fi
44-
456
pip install .
467
pip install -r test_requirements.txt
478
pip install flake8

hpack/hpack_compat.py

Lines changed: 0 additions & 107 deletions
This file was deleted.

test/test_hpack.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -772,19 +772,3 @@ def _prepend_colon(k):
772772

773773
assert expected_special == received_special
774774
assert expected_boring == received_boring
775-
776-
777-
class TestUtilities(object):
778-
def test_nghttp2_installs_correctly(self):
779-
# This test is a debugging tool: if nghttp2 is being tested by Travis,
780-
# we need to confirm it imports correctly. Hyper will normally hide the
781-
# import failure, so let's discover it here.
782-
# Alternatively, if we are *not* testing with nghttp2, this test should
783-
# confirm that it's not available.
784-
if os.environ.get('NGHTTP2'):
785-
import nghttp2
786-
else:
787-
with pytest.raises(ImportError):
788-
import nghttp2 # noqa
789-
790-
assert True

0 commit comments

Comments
 (0)