Removing files with generated counts.

Author: jmctwilio

.travis.yml

@@ -1,13 +1,13 @@
 language: python
 python:
-  - "2.6"
   - "2.7"
   - "3.3"
   - "3.4"
   - "3.5"
   - "3.6"
 install:
+  - pip install virtualenv --upgrade
   - make install
   - make test-install
-script: 
+script:
   - make test

CHANGES.md

@@ -3,6 +3,18 @@ twilio-python Changelog
 
 Here you can see the full list of changes between each twilio-python release.
 
+[2017-06-15] Version 6.4.0
+--------------------------
+
+- Remove support for Python 2.6.
+- Add `locality` field to `AvailablePhoneNumbers`.
+- Add `origin` field to `IncomingPhoneNumbers`.
+- Add `in_locality` parameter to `AvailablePhoneNumbers`.
+- Add `origin` parameter to `IncomingPhoneNumbers`.
+- Add new sync categories to `UsageRecords`.
+- Support unicode in `validation_client`.
+- Add `muted` parameter to `<Conference>` Twiml.
+
 [2017-05-24] Version 6.3.0
 --------------------------
 

Makefile

@@ -1,7 +1,7 @@
 .PHONY: clean install analysis test test-install develop docs docs-install
 
 venv:
-	virtualenv venv
+	virtualenv --python=python venv
 
 install: venv
 	. venv/bin/activate; pip install .

setup.py

@@ -15,8 +15,6 @@
 # documentation: http://pypi.python.org/pypi/setuptools
 REQUIRES = ["requests >= 2.0.0", "six", "pytz", "PyJWT >= 1.4.2"]
 
-if sys.version_info < (2, 6):
-    REQUIRES.append('simplejson')
 if sys.version_info < (3, 0):
     REQUIRES.extend(["cryptography >= 1.3.4", "idna >= 2.0.0", "pyOpenSSL >= 0.14"])
 if sys.version_info >= (3, 0):
@@ -46,7 +44,6 @@
         "License :: OSI Approved :: MIT License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
-        "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.3",
         "Programming Language :: Python :: 3.4",

tests/integration/accounts/v1/credential/test_public_key.py

@@ -37,7 +37,6 @@ def test_read_empty_response(self):
                     "key": "credentials",
                     "next_page_url": null,
                     "page": 0,
-                    "count": 0,
                     "page_size": 50,
                     "previous_page_url": null,
                     "url": "https://accounts.twilio.com/v1/Credentials/PublicKeys?PageSize=50&Page=0"
@@ -71,7 +70,6 @@ def test_read_full_response(self):
                     "key": "credentials",
                     "next_page_url": null,
                     "page": 0,
-                    "count": 1,
                     "page_size": 50,
                     "previous_page_url": null,
                     "url": "https://accounts.twilio.com/v1/Credentials/PublicKeys?PageSize=50&Page=0"

tests/integration/api/v2010/account/address/test_dependent_phone_number.py

@@ -32,7 +32,6 @@ def test_read_full_response(self):
             200,
             '''
             {
-                "count": 1,
                 "dependent_phone_numbers": [
                     {
                         "address_requirements": "any",
@@ -73,7 +72,6 @@ def test_read_empty_response(self):
             200,
             '''
             {
-                "count": 0,
                 "dependent_phone_numbers": [],
                 "first_page_uri": "/2010-04-01/Accounts/ACaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/Addresses/ADaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/DependentPhoneNumbers.json?Page=0&PageSize=50",
                 "next_page_uri": null,

tests/integration/api/v2010/account/available_phone_number/test_local.py

@@ -59,7 +59,6 @@ def test_read_full_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 1,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,
@@ -86,7 +85,6 @@ def test_read_empty_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 0,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,

tests/integration/api/v2010/account/available_phone_number/test_mobile.py

@@ -58,7 +58,6 @@ def test_read_full_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 1,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,
@@ -85,7 +84,6 @@ def test_read_empty_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 0,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,

tests/integration/api/v2010/account/available_phone_number/test_toll_free.py

@@ -58,7 +58,6 @@ def test_read_full_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 1,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,
@@ -85,7 +84,6 @@ def test_read_empty_response(self):
                 "next_page_uri": null,
                 "num_pages": 1,
                 "page": 0,
-                "count": 0,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,

tests/integration/api/v2010/account/call/test_notification.py

@@ -126,7 +126,6 @@ def test_read_full_response(self):
                 ],
                 "num_pages": 1,
                 "page": 0,
-                "count": 1,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,
@@ -154,7 +153,6 @@ def test_read_empty_response(self):
                 "notifications": [],
                 "num_pages": 1,
                 "page": 0,
-                "count": 0,
                 "page_size": 50,
                 "previous_page_uri": null,
                 "start": 0,