Prepare 0.11.8

CHANGELOG.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.11.8
+------
+2019-12-13
+
+- Minor fixes in setup.py.
+
 0.11.7
 ------
 2019-12-13

MANIFEST.in

@@ -1,4 +1,5 @@
 recursive-include  src/tld/res *
+recursive-include  src_py27/tld/res *
 recursive-include  src_py35/tld/res *
 include README.rst
 include CHANGELOG.rst

README.rst

@@ -281,6 +281,12 @@ Development tips follow:
 
 Python 2.7
 ----------
+**Install from pip**
+
+.. code-block:: sh
+
+    pip install tld[py27]
+
 **Install locally in development mode**
 
 .. code-block:: sh
@@ -301,6 +307,12 @@ Python 2.7
 
 Python 3.5
 ----------
+**Install from pip**
+
+.. code-block:: sh
+
+    pip install tld[py35]
+
 **Install locally in development mode**
 
 .. code-block:: sh

docs/changelog.rst

@@ -15,6 +15,12 @@ are used for versioning (schema follows below):
   0.3.4 to 0.4).
 - All backwards incompatible changes are mentioned in this document.
 
+0.11.8
+------
+2019-12-13
+
+- Minor fixes in setup.py.
+
 0.11.7
 ------
 2019-12-13

docs/index.rst

@@ -281,6 +281,12 @@ Development tips follow:
 
 Python 2.7
 ----------
+**Install from pip**
+
+.. code-block:: sh
+
+    pip install tld[py27]
+
 **Install locally in development mode**
 
 .. code-block:: sh
@@ -301,6 +307,12 @@ Python 2.7
 
 Python 3.5
 ----------
+**Install from pip**
+
+.. code-block:: sh
+
+    pip install tld[py35]
+
 **Install locally in development mode**
 
 .. code-block:: sh

scripts/prepare_build_py27.sh

@@ -4,6 +4,7 @@
 rm -rf src_py27/
 cp -R src/ src_py27/
 py-backwards -i src/ -o src_py27/ -t 2.7 -d
+cp -R src/tld/res/ src_py27/tld/
 sed -i '' -e 's/from functools import lru_cache/from backports.functools_lru_cache import lru_cache/g' $(find src_py27 -type f)
 sed -i '' -e "s/= type(u'/= type('/g" $(find src_py27 -type f)
 sed -i '' -e "s/=u'/='/g" $(find src_py27 -type f)

setup.py

@@ -7,7 +7,7 @@
 except:
     readme = ''
 
-version = '0.11.7'
+version = '0.11.8'
 
 py_where = './src'
 py_package_dir = 'src'
@@ -68,7 +68,10 @@
     },
     include_package_data=True,
     license='MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-or-later',
-    install_requires=[],
+    install_requires=[
+        'six;python_version<="3.5"',  # Used in Python 2.7 and 3.5 dist
+        'backports.functools-lru-cache;python_version<"3.5"',  # For Python 2.7
+    ],
     test_suite='tld.tests',
     tests_require=[
         'coverage',
@@ -77,7 +80,5 @@
         'pytest-cov',
         'pytest',
         'tox',
-        'six',  # Python 3.6 dist does not use it, but 2.7 and 3.5 do.
-        'backports.functools-lru-cache',  # For Python 2.7.
     ]
 )

src/tld/__init__.py

@@ -9,7 +9,7 @@
 )
 
 __title__ = 'tld'
-__version__ = '0.11.7'
+__version__ = '0.11.8'
 __author__ = 'Artur Barseghyan'
 __copyright__ = '2013-2019 Artur Barseghyan'
 __license__ = 'MPL-1.1 OR GPL-2.0-only OR LGPL-2.0-or-later'