Skip to content

Commit

Permalink
Just remove nghttp2 support.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukasa committed Aug 15, 2016
1 parent 873c65a commit 7bd185d
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 171 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,6 @@ python:
- "3.5"
- pypy

env:
- NGHTTP2=true
- NGHTTP2=

matrix:
exclude:
- env: NGHTTP2=true
python: pypy

install:
- ".travis/install.sh"
before_script: "flake8 hpack test"
Expand Down
39 changes: 0 additions & 39 deletions .travis/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,6 @@
set -e
set -x

if [[ "$NGHTTP2" = true ]]; then
# GCC 4.6 seems to cause problems, so go straight to 4.8.
sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
sudo apt-get update
sudo apt-get install g++-4.8 libstdc++-4.8-dev
export CXX="g++-4.8" CC="gcc-4.8"
$CC --version

# Install nghttp2. Right now I haven't built a PPA for this so we have to
# do it from source, which kinda sucks. First, install a ton of
# prerequisite packages.
sudo apt-get install autoconf automake autotools-dev libtool pkg-config \
zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \
libevent-dev libjansson-dev libjemalloc-dev
pip install cython

# Now, download and install nghttp2's latest version.
git clone https://github.com/tatsuhiro-t/nghttp2.git
cd nghttp2
DIR=`pwd`
export PYTHONPATH="$DIR/lib/python${TRAVIS_PYTHON_VERSION}/site-packages"
mkdir -p $PYTHONPATH
autoreconf -i
automake
autoconf
./configure --disable-threads --prefix=`pwd`
make
make install

# The makefile doesn't install into the active virtualenv. Install again.
cd python
python setup.py install
cd ../..

# Let's try ldconfig.
sudo sh -c 'echo "/usr/local/lib" > /etc/ld.so.conf.d/libnghttp2.conf'
sudo ldconfig
fi

pip install .
pip install -r test_requirements.txt
pip install flake8
107 changes: 0 additions & 107 deletions hpack/hpack_compat.py

This file was deleted.

16 changes: 0 additions & 16 deletions test/test_hpack.py
Original file line number Diff line number Diff line change
Expand Up @@ -772,19 +772,3 @@ def _prepend_colon(k):

assert expected_special == received_special
assert expected_boring == received_boring


class TestUtilities(object):
def test_nghttp2_installs_correctly(self):
# This test is a debugging tool: if nghttp2 is being tested by Travis,
# we need to confirm it imports correctly. Hyper will normally hide the
# import failure, so let's discover it here.
# Alternatively, if we are *not* testing with nghttp2, this test should
# confirm that it's not available.
if os.environ.get('NGHTTP2'):
import nghttp2
else:
with pytest.raises(ImportError):
import nghttp2 # noqa

assert True

0 comments on commit 7bd185d

Please sign in to comment.