Kill the devel branchdevel

13 files changed, 1 insertions, 2793 deletions

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f24cd99..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-*.py[co]
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-
-#Translations
-*.mo
-
-#Mr Developer
-.mr.developer.cfg
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index c40859c..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,62 +0,0 @@
-language: python
-sudo: required
-dist: xenial
-
-addons:
-  apt:
-    sources:
-      - deadsnakes
-    packages:
-      - python2.4
-      - python2.5
-      - python2.6
-      - python3.2
-      - python3.3
-
-matrix:
-  include:
-    - python: 2.7
-      env: TOXENV=flake8
-    - python: 2.7
-      env: TOXENV=py24
-    - python: 2.7
-      env: TOXENV=py25
-    - python: 2.7
-      env: TOXENV=py26
-    - python: 2.7
-      env: TOXENV=py27
-    - python: 2.7
-      env: TOXENV=py32
-    - python: 2.7
-      env: TOXENV=py33
-    - python: 3.4
-      env: TOXENV=py34
-    - python: 3.5
-      env: TOXENV=py35
-    - python: 3.6
-      env: TOXENV=py36
-    - python: 3.7
-      env: TOXENV=py37
-    - python: 3.8-dev
-      env: TOXENV=py38
-    - python: pypy
-      env: TOXENV=pypy
-      dist: trusty
-
-before_install:
-  - if [[ $(echo "$TOXENV" | egrep -c "py35") != 0 ]]; then pyenv global system 3.5; fi;
-
-install:
-  - if [[ $(echo "$TOXENV" | egrep -c "py32") != 0 ]]; then pip install setuptools==17.1.1; fi;
-  - if [[ $(echo "$TOXENV" | egrep -c "(py2[45]|py3[12])") != 0 ]]; then pip install virtualenv==1.7.2 tox==1.3; fi;
-  - if [[ $(echo "$TOXENV" | egrep -c "(py26|py33)") != 0 ]]; then pip install virtualenv==15.2.0 tox==2.9.1; fi;
-  - if [[ $(echo "$TOXENV" | egrep -c "(py2[456]|py3[123])") == 0 ]]; then pip install tox; fi;
-
-
-
-script:
-  - tox
-
-notifications:
-  email:
-    - matt@sivel.net
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index f40e03a..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Pull Requests
-
-## Pull requests should be
-
-1. Made against the `devel` branch.
-1. Made from a git feature branch.
-
-## Pull requests will not be accepted that
-
-1. Are not made against the `devel` branch
-1. Are submitted from a branch named `devel`
-1. Do not pass pep8/pyflakes/flake8
-1. Do not work with Python 2.4-3.4 or pypy
-1. Add python modules not included with the Python standard library
-1. Are made by editing files via the GitHub website
-
-# Coding Guidelines
-
-In general, I follow strict pep8 and pyflakes. All code must pass these tests. Since we support python 2.4-3.4 and pypy, pyflakes reports unknown names in python 3.  pyflakes is run in python 2.7 only in my tests.
-
-## Some other points
-
-1. Do not use `\` for line continuations, long strings should be wrapped in `()`.  Imports should start a brand new line in the form of `from foo import...`
-1. String quoting should be done with single quotes `'`, except for situations where you would otherwise have to escape an internal single quote
-1. Docstrings should use three double quotes `"""`
-1. All functions, classes and modules should have docstrings following both the PEP257 and PEP8 standards
-1. Inline comments should only be used on code where it is not immediately obvious what the code achieves
-
-# Supported Python Versions
-
-All code needs to support Python 2.4-3.4 and pypy.
-
-# Permitted Python Modules
-
-Only modules included in the standard library are permitted for use in this application.  This application should not be dependent on any 3rd party modules that would need to be installed external to just Python itself.
-
-# Testing
-
-Currently there are no unit tests, but they are planned.
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index 9d5d250..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include LICENSE
-include README.rst
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 7a98f31..0000000
--- a/README.rst
+++ /dev/null
@@ -1,154 +0,0 @@
-speedtest-cli
-=============
-
-Command line interface for testing internet bandwidth using
-speedtest.net
-
-.. image:: https://img.shields.io/pypi/v/speedtest-cli.svg
-        :target: https://pypi.python.org/pypi/speedtest-cli/
-        :alt: Latest Version
-.. image:: https://img.shields.io/travis/sivel/speedtest-cli.svg
-        :target: https://pypi.python.org/pypi/speedtest-cli/
-        :alt: Travis
-.. image:: https://img.shields.io/pypi/l/speedtest-cli.svg
-        :target: https://pypi.python.org/pypi/speedtest-cli/
-        :alt: License
-
-Versions
---------
-
-speedtest-cli works with Python 2.4-3.7
-
-.. image:: https://img.shields.io/pypi/pyversions/speedtest-cli.svg
-        :target: https://pypi.python.org/pypi/speedtest-cli/
-        :alt: Versions
-
-Installation
-------------
-
-pip / easy\_install
-~~~~~~~~~~~~~~~~~~~
-
-::
-
-    pip install speedtest-cli
-
-or
-
-::
-
-    easy_install speedtest-cli
-
-Github
-~~~~~~
-
-::
-
-    pip install git+https://github.com/sivel/speedtest-cli.git
-
-or
-
-::
-
-    git clone https://github.com/sivel/speedtest-cli.git
-    cd speedtest-cli
-    python setup.py install
-
-Just download (Like the way it used to be)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-::
-
-    wget -O speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
-    chmod +x speedtest-cli
-
-or
-
-::
-
-    curl -Lo speedtest-cli https://raw.githubusercontent.com/sivel/speedtest-cli/master/speedtest.py
-    chmod +x speedtest-cli
-
-Usage
------
-
-::
-
-    $ speedtest-cli -h
-    usage: speedtest-cli [-h] [--no-download] [--no-upload] [--single] [--bytes]
-                         [--share] [--simple] [--csv]
-                         [--csv-delimiter CSV_DELIMITER] [--csv-header] [--json]
-                         [--list] [--server SERVER] [--exclude EXCLUDE]
-                         [--mini MINI] [--source SOURCE] [--timeout TIMEOUT]
-                         [--secure] [--no-pre-allocate] [--version]
-
-    Command line interface for testing internet bandwidth using speedtest.net.
-    --------------------------------------------------------------------------
-    https://github.com/sivel/speedtest-cli
-
-    optional arguments:
-      -h, --help            show this help message and exit
-      --no-download         Do not perform download test
-      --no-upload           Do not perform upload test
-      --single              Only use a single connection instead of multiple. This
-                            simulates a typical file transfer.
-      --bytes               Display values in bytes instead of bits. Does not
-                            affect the image generated by --share, nor output from
-                            --json or --csv
-      --share               Generate and provide a URL to the speedtest.net share
-                            results image, not displayed with --csv
-      --simple              Suppress verbose output, only show basic information
-      --csv                 Suppress verbose output, only show basic information
-                            in CSV format. Speeds listed in bit/s and not affected
-                            by --bytes
-      --csv-delimiter CSV_DELIMITER
-                            Single character delimiter to use in CSV output.
-                            Default ","
-      --csv-header          Print CSV headers
-      --json                Suppress verbose output, only show basic information
-                            in JSON format. Speeds listed in bit/s and not
-                            affected by --bytes
-      --list                Display a list of speedtest.net servers sorted by
-                            distance
-      --server SERVER       Specify a server ID to test against. Can be supplied
-                            multiple times
-      --exclude EXCLUDE     Exclude a server from selection. Can be supplied
-                            multiple times
-      --mini MINI           URL of the Speedtest Mini server
-      --source SOURCE       Source IP address to bind to
-      --timeout TIMEOUT     HTTP timeout in seconds. Default 10
-      --secure              Use HTTPS instead of HTTP when communicating with
-                            speedtest.net operated servers
-      --no-pre-allocate     Do not pre allocate upload data. Pre allocation is
-                            enabled by default to improve upload performance. To
-                            support systems with insufficient memory, use this
-                            option to avoid a MemoryError
-      --version             Show the version number and exit
-
-
-Python API
-----------
-
-See the `wiki <https://github.com/sivel/speedtest-cli/wiki>`_.
-
-
-Inconsistency
--------------
-
-It is not a goal of this application to be a reliable latency reporting tool.
-
-Latency reported by this tool should not be relied on as a value indicative of ICMP
-style latency. It is a relative value used for determining the lowest latency server
-for performing the actual speed test against.
-
-There is the potential for this tool to report results inconsistent with Speedtest.net.
-There are several concepts to be aware of that factor into the potential inconsistency:
-
-1. Speedtest.net has migrated to using pure socket tests instead of HTTP based tests
-2. This application is written in Python
-3. Different versions of Python will execute certain parts of the code faster than others
-4. CPU and Memory capacity and speed will play a large part in inconsistency between
-   Speedtest.net and even other machines on the same network
-
-Issues relating to inconsistencies will be closed as wontfix and without
-additional reason or context.
diff --git a/README.txt b/README.txt
new file mode 100644
index 0000000..fa008a2
--- /dev/null
+++ b/README.txt
@@ -0,0 +1 @@
+Use the master branch
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 7c964b4..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[wheel]
-universal=1
diff --git a/setup.py b/setup.py
deleted file mode 100644
index a617be4..0000000
--- a/setup.py
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright 2012 Matt Martz
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-import re
-import codecs
-
-from setuptools import setup
-
-here = os.path.abspath(os.path.dirname(__file__))
-
-
-# Read the version number from a source file.
-# Why read it, and not import?
-# see https://groups.google.com/d/topic/pypa-dev/0PkjVpcxTzQ/discussion
-def find_version(*file_paths):
-    # Open in Latin-1 so that we avoid encoding errors.
-    # Use codecs.open for Python 2 compatibility
-    try:
-        f = codecs.open(os.path.join(here, *file_paths), 'r', 'latin1')
-        version_file = f.read()
-        f.close()
-    except:
-        raise RuntimeError("Unable to find version string.")
-
-    # The version line must have the form
-    # __version__ = 'ver'
-    version_match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]",
-                              version_file, re.M)
-    if version_match:
-        return version_match.group(1)
-    raise RuntimeError("Unable to find version string.")
-
-
-# Get the long description from the relevant file
-try:
-    f = codecs.open('README.rst', encoding='utf-8')
-    long_description = f.read()
-    f.close()
-except:
-    long_description = ''
-
-
-setup(
-    name='speedtest-cli',
-    version=find_version('speedtest.py'),
-    description=('Command line interface for testing internet bandwidth using '
-                 'speedtest.net'),
-    long_description=long_description,
-    keywords='speedtest speedtest.net',
-    author='Matt Martz',
-    author_email='matt@sivel.net',
-    url='https://github.com/sivel/speedtest-cli',
-    license='Apache License, Version 2.0',
-    py_modules=['speedtest'],
-    entry_points={
-        'console_scripts': [
-            'speedtest=speedtest:main',
-            'speedtest-cli=speedtest:main'
-        ]
-    },
-    classifiers=[
-        'Development Status :: 5 - Production/Stable',
-        'Programming Language :: Python',
-        'Environment :: Console',
-        'License :: OSI Approved :: Apache Software License',
-        'Operating System :: OS Independent',
-        'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.4',
-        'Programming Language :: Python :: 2.5',
-        'Programming Language :: Python :: 2.6',
-        'Programming Language :: Python :: 2.7',
-        'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.1',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
-        'Programming Language :: Python :: 3.4',
-        'Programming Language :: Python :: 3.5',
-        'Programming Language :: Python :: 3.6',
-        'Programming Language :: Python :: 3.7',
-    ]
-)
diff --git a/speedtest-cli.1 b/speedtest-cli.1
deleted file mode 100644
index 367c977..0000000
--- a/speedtest-cli.1
+++ /dev/null
@@ -1,143 +0,0 @@
-.TH "speedtest-cli" 1 "2018-01-05" "speedtest-cli"
-.SH NAME
-speedtest\-cli \- Command line interface for testing internet bandwidth using speedtest.net
-.SH SYNOPSIS
-.B speedtest\-cli
-[OPTION...]
-.SH DESCRIPTION
-Speedtest.net is a web service for testing your broadband connection by downloading a file
-from a nearby speedtest.net server on the web. This tool allows you to access the service
-from the command line.
-
-Speedtest mini is a version of the Speedtest.net server that you can host locally.
-
-.SH OPTIONS
-Usage: speedtest\-cli [OPTION...]
-
-.B Help Options
-
-\fB\-h, \-\-help\fR
-.RS
-Displays usage for the tool.
-.RE
-
-.B Options
-
-\fB\-\-no\-download\fR
-.RS
-Do not perform download test
-.RE
-
-\fB\-\-no\-upload\fR
-.RS
-Do not perform upload test
-.RE
-
-\fB\-\-single\fR
-.RS
-Only use a single connection instead of multiple. This simulates a typical file transfer.
-.RE
-
-\fB\-\-bytes\fR
-.RS
-Display values in bytes instead of bits. Does not affect the image generated by \-\-share, nor output from \-\-json or \-\-csv
-.RE
-
-\fB\-\-share\fR
-.RS
-Generate and provide a URL to the speedtest.net share results image, not displayed with \-\-csv
-.RE
-
-\fB\-\-simple\fR
-.RS
-Suppress verbose output, only show basic information
-.RE
-
-\fB\-\-csv\fR
-.RS
-Suppress verbose output, only show basic information in CSV format. Speeds listed in bit/s and not affected by \-\-bytes
-.RE
-
-\fB\-\-csv\-delimiter CSV_DELIMITER\fR
-.RS
-Single character delimiter to use in CSV output. Default ","
-.RE
-
-\fB\-\-csv\-header\fR
-.RS
-Print CSV headers
-.RE
-
-\fB\-\-json\fR
-.RS
-Suppress verbose output, only show basic information in JSON format. Speeds listed in bit/s and not affected by \-\-bytes
-.RE
-
-\fB\-\-list\fR
-.RS
-Display a list of speedtest.net servers sorted by distance
-.RE
-
-\fB\-\-server SERVER\fR
-.RS
-Specify a server ID to test against. Can be supplied multiple times
-.RE
-
-\fB\-\-exclude EXCLUDE\fR
-.RS
-Exclude a server from selection. Can be supplied multiple times
-.RE
-
-\fB\-\-mini MINI\fR
-.RS
-URL of the Speedtest Mini server
-.RE
-
-\fB\-\-source SOURCE\fR
-.RS
-Source IP address to bind to
-.RE
-
-\fB\-\-timeout TIMEOUT\fR
-.RS
-HTTP timeout in seconds. Default 10
-.RE
-
-\fB\-\-secure\fR
-.RS
-Use HTTPS instead of HTTP when communicating with speedtest.net operated servers
-.RE
-
-\fB\-\-no\-pre\-allocate\fR
-.RS
-Do not pre allocate upload data. Pre allocation is enabled by default to improve upload performance. To support systems with insufficient memory, use this option to avoid a MemoryError
-.RE
-
-\fB\-\-version\fR
-.RS
-Show the version number and exit
-.RE
-
-.SH EXAMPLES
-
-\fBAutomatically find closest server and start testing\fR
-.RS
-speedtest\-cli
-.RE
-
-\fBSpecify testing against server 1491\fR
-.RS
-speedtest-cli \-\-server 1491
-.RE
-
-\fBTesting against Speedtest Mini\fR
-.RS
-speedtest-cli \-\-mini 172.18.66.1
-.RE
-
-.SH REPORTING BUGS
-Please file issues on the Github bug tracker: https://github.com/sivel/speedtest\-cli
-
-.SH AUTHORS
-This manual page was written by Jonathan Carter <jonathan@ubuntu.com>
-Speedtest\-cli was written by Matt Martz <matt@sivel.net>
diff --git a/speedtest.py b/speedtest.py
deleted file mode 100755
index a33296d..0000000
--- a/speedtest.py
+++ /dev/null
@@ -1,2004 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# Copyright 2012 Matt Martz
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import os
-import re
-import csv
-import sys
-import math
-import errno
-import signal
-import socket
-import timeit
-import datetime
-import platform
-import threading
-import xml.parsers.expat
-
-try:
-    import gzip
-    GZIP_BASE = gzip.GzipFile
-except ImportError:
-    gzip = None
-    GZIP_BASE = object
-
-__version__ = '2.1.3'
-
-
-class FakeShutdownEvent(object):
-    """Class to fake a threading.Event.isSet so that users of this module
-    are not required to register their own threading.Event()
-    """
-
-    @staticmethod
-    def isSet():
-        "Dummy method to always return false"""
-        return False
-
-
-# Some global variables we use
-DEBUG = False
-_GLOBAL_DEFAULT_TIMEOUT = object()
-PY25PLUS = sys.version_info[:2] >= (2, 5)
-PY26PLUS = sys.version_info[:2] >= (2, 6)
-PY32PLUS = sys.version_info[:2] >= (3, 2)
-
-# Begin import game to handle Python 2 and Python 3
-try:
-    import json
-except ImportError:
-    try:
-        import simplejson as json
-    except ImportError:
-        json = None
-
-try:
-    import xml.etree.ElementTree as ET
-    try:
-        from xml.etree.ElementTree import _Element as ET_Element
-    except ImportError:
-        pass
-except ImportError:
-    from xml.dom import minidom as DOM
-    from xml.parsers.expat import ExpatError
-    ET = None
-
-try:
-    from urllib2 import (urlopen, Request, HTTPError, URLError,
-                         AbstractHTTPHandler, ProxyHandler,
-                         HTTPDefaultErrorHandler, HTTPRedirectHandler,
-                         HTTPErrorProcessor, OpenerDirector)
-except ImportError:
-    from urllib.request import (urlopen, Request, HTTPError, URLError,
-                                AbstractHTTPHandler, ProxyHandler,
-                                HTTPDefaultErrorHandler, HTTPRedirectHandler,
-                                HTTPErrorProcessor, OpenerDirector)
-
-try:
-    from httplib import HTTPConnection, BadStatusLine
-except ImportError:
-    from http.client import HTTPConnection, BadStatusLine
-
-try:
-    from httplib import HTTPSConnection
-except ImportError:
-    try:
-        from http.client import HTTPSConnection
-    except ImportError:
-        HTTPSConnection = None
-
-try:
-    from httplib import FakeSocket
-except ImportError:
-    FakeSocket = None
-
-try:
-    from Queue import Queue
-except ImportError:
-    from queue import Queue
-
-try:
-    from urlparse import urlparse
-except ImportError:
-    from urllib.parse import urlparse
-
-try:
-    from urlparse import parse_qs
-except ImportError:
-    try:
-        from urllib.parse import parse_qs
-    except ImportError:
-        from cgi import parse_qs
-
-try:
-    from hashlib import md5
-except ImportError:
-    from md5 import md5
-
-try:
-    from argparse import ArgumentParser as ArgParser
-    from argparse import SUPPRESS as ARG_SUPPRESS
-    PARSER_TYPE_INT = int
-    PARSER_TYPE_STR = str
-    PARSER_TYPE_FLOAT = float
-except ImportError:
-    from optparse import OptionParser as ArgParser
-    from optparse import SUPPRESS_HELP as ARG_SUPPRESS
-    PARSER_TYPE_INT = 'int'
-    PARSER_TYPE_STR = 'string'
-    PARSER_TYPE_FLOAT = 'float'
-
-try:
-    from cStringIO import StringIO
-    BytesIO = None
-except ImportError:
-    try:
-        from StringIO import StringIO
-        BytesIO = None
-    except ImportError:
-        from io import StringIO, BytesIO
-
-try:
-    import __builtin__
-except ImportError:
-    import builtins
-    from io import TextIOWrapper, FileIO
-
-    class _Py3Utf8Output(TextIOWrapper):
-        """UTF-8 encoded wrapper around stdout for py3, to override
-        ASCII stdout
-        """
-        def __init__(self, f, **kwargs):
-            buf = FileIO(f.fileno(), 'w')
-            super(_Py3Utf8Output, self).__init__(
-                buf,
-