Merge branch 'release/0.0.5'

clemfromspace · Sep 8, 2018 · fa34af2 · fa34af2
2 parents 319f998 + b396dbc
commit fa34af2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # Scrapy with selenium
-[![PyPI](https://img.shields.io/pypi/v/scrapy-selenium.svg)](https://pypi.python.org/pypi/scrapy-selenium) [![Build Status](https://travis-ci.org/clemfromspace/scrapy-selemnium.svg?branch=master)](https://travis-ci.org/clemfromspace/scrapy-selenium) [![Test Coverage](https://api.codeclimate.com/v1/badges/5c737098dc38a835ff96/test_coverage)](https://codeclimate.com/github/clemfromspace/scrapy-selenium/test_coverage) [![Maintainability](https://api.codeclimate.com/v1/badges/5c737098dc38a835ff96/maintainability)](https://codeclimate.com/github/clemfromspace/scrapy-selenium/maintainability)
+[![PyPI](https://img.shields.io/pypi/v/scrapy-selenium.svg)](https://pypi.python.org/pypi/scrapy-selenium) [![Build Status](https://travis-ci.org/clemfromspace/scrapy-selenium.svg?branch=master)](https://travis-ci.org/clemfromspace/scrapy-selenium) [![Test Coverage](https://api.codeclimate.com/v1/badges/5c737098dc38a835ff96/test_coverage)](https://codeclimate.com/github/clemfromspace/scrapy-selenium/test_coverage) [![Maintainability](https://api.codeclimate.com/v1/badges/5c737098dc38a835ff96/maintainability)](https://codeclimate.com/github/clemfromspace/scrapy-selenium/maintainability)
 
 Scrapy middleware to handle javascript pages using selenium.
 

diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = scrapy-selenium
-version = 0.0.4
+version = 0.0.5
 url = https://github.com/clemfromspace/scrapy-selenium
 licence = DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
 description = Scrapy with selenium

diff --git a/setup.py b/setup.py
@@ -1,8 +1,14 @@
 """This module contains the packaging routine for the pybook package"""
 
 from setuptools import setup, find_packages
-from pip.download import PipSession
-from pip.req import parse_requirements
+try:
+    from pip.download import PipSession
+    from pip.req import parse_requirements
+except ImportError:
+    # It is quick hack to support pip 10 that has changed its internal
+    # structure of the modules.
+    from pip._internal.download import PipSession
+    from pip._internal.req.req_file import parse_requirements
 
 
 def get_requirements(source):