Set urllib3 as an external dependency

MANIFEST.in

@@ -1,5 +1,6 @@
 include tx
 include txclib/cacert.pem
+include requirements.txt
 
 # Docs
 include LICENSE README.rst

appveyor.yml

@@ -47,6 +47,7 @@ install:
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
   #- "%CMD_IN_ENV% pip install -r dev-requirements.txt"
+  - pip install -r requirements.txt
 
 build_script:
   # Build the compiled extension

requirements.txt

@@ -0,0 +1 @@
+urllib3

setup.py

@@ -1,53 +1,35 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-import os.path
-import io
+from codecs import open
 from setuptools import setup
-import txclib
-
 
-readme_file = io.open('README.rst', 'rt', encoding='UTF-8')
-long_description = readme_file.read()
-readme_file.close()
-
-package_data = {
-    '': ['LICENSE', 'README.rst'],
-    'txclib': ['*.pem'],
-}
+import txclib
 
-scripts = ['tx']
 
-install_requires = []
-extra_args = {}
+def get_file_content(filename):
+    with open(filename, 'r', encoding='UTF-8') as f:
+        return f.read()
 
 setup(
     name="transifex-client",
     version=txclib.__version__,
-    scripts=scripts,
+    scripts=['tx'],
     description="A command line interface for Transifex",
-    long_description=long_description,
+    long_description=get_file_content('README.rst'),
     author="Transifex",
     author_email="[email protected]",
     url="https://www.transifex.com",
     license="GPLv2",
-    dependency_links=[
-    ],
-    setup_requires=[
-    ],
-    install_requires=install_requires,
-    tests_require=["mock", ],
-    data_files=[
-    ],
+    dependency_links=[],
+    setup_requires=[],
+    install_requires=get_file_content('requirements.txt').splitlines(),
+    tests_require=["mock"],
+    data_files=[],
     test_suite="tests",
     zip_safe=False,
-    packages=[
-        'txclib', 'txclib.packages', 'txclib.packages.urllib3',
-        'txclib.packages.urllib3.contrib',
-        'txclib.packages.urllib3.packages',
-        'txclib.packages.urllib3.packages.ssl_match_hostname',
-    ],
+    packages=['txclib'],
     include_package_data=True,
-    package_data=package_data,
+    package_data={},
     keywords=('translation', 'localization', 'internationalization',),
     classifiers=[
         'Programming Language :: Python',
@@ -57,5 +39,4 @@
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.5',
     ],
-    **extra_args
 )

tx

@@ -4,11 +4,11 @@
 import os
 import sys
 from optparse import OptionParser
+from urllib3.exceptions import SSLError
 
 import txclib
 from txclib import utils
 from txclib.log import set_log_level, logger
-from txclib.packages.urllib3.exceptions import SSLError
 
 
 # This block ensures that ^C interrupts are handled quietly.

txclib/commands.py

@@ -25,6 +25,7 @@
 except ImportError:
     import ConfigParser as configparser
 
+from urllib3.packages.six.moves import input
 
 from txclib import utils, project
 from txclib.utils import parse_json, compile_json, files_in_project
@@ -34,7 +35,6 @@
         status_parser, pull_parser, set_parser, push_parser, init_parser
 from txclib.paths import posix_path
 from txclib.log import logger
-from txclib.packages.urllib3.packages.six.moves import input
 
 
 def cmd_init(argv, path_to_tx):

txclib/config.py

@@ -3,7 +3,7 @@
 except ImportError:
     import ConfigParser as configparser
 
-from txclib.packages.urllib3.packages import six
+from urllib3.packages import six
 
 
 class OrderedRawConfigParser(configparser.RawConfigParser):

txclib/log.py

@@ -7,7 +7,7 @@
 import sys
 import logging
 
-_logger = logging.getLogger('txclib.packages.urllib3')
+_logger = logging.getLogger('urllib3')
 _logger.setLevel(logging.CRITICAL)
 
 _logger = logging.getLogger('txclib')