pydrive2: bump to 0.14.0

Author: efiop

CONTRIBUTING.rst

@@ -4,24 +4,10 @@ Contributing guidelines
 How to become a contributor and submit your own code
 ----------------------------------------------------
 
-Contributor License Agreements
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-We'd love to accept your patches! Before we can take them, we have to jump a couple of legal hurdles.
-
-Please fill out either the individual or corporate Contributor License Agreement (CLA).
-
-* If you are an individual writing original source code and you're sure you
-  own the intellectual property, then you'll need to sign an `individual CLA <http://code.google.com/legal/individual-cla-v1.0.html>`_.
-* If you work for a company that wants to allow you to contribute your
-  work, then you'll need to sign a `corporate CLA <http://code.google.com/legal/corporate-cla-v1.0.html>`_.
-
-Follow either of the two links above to access the appropriate CLA and instructions for how to sign and return it. Once we receive it, we'll be able to accept your pull requests.
-
-***NOTE***: Only original source code from you and other people that have signed the CLA can be accepted into the main repository.
+TODO
 
 Contributing code
 ~~~~~~~~~~~~~~~~~
 
-If you have improvements to PyDrive, send us your pull requests! For those
-just getting started, Github has a `howto <https://help.github.com/articles/using-pull-requests/>`_.
+If you have improvements to PyDrive2, send us your pull requests! For those
+just getting started, Github has a `howto <https://help.github.com/articles/using-pull-requests/>`_.

MANIFEST.in

@@ -4,5 +4,5 @@ include LICENSE
 include MANIFEST.in
 include README.rst
 recursive-include docs *
-recursive-include pydrive/test *
+recursive-include pydrive2/test *
 recursive-exclude * *.py[co]

README.rst

@@ -1,18 +1,19 @@
-PyDrive
+PyDrive2
 -------
 
-*PyDrive* is a wrapper library of
+*PyDrive2* is a wrapper library of
 `google-api-python-client <https://github.com/google/google-api-python-client>`_
-that simplifies many common Google Drive API tasks.
+that simplifies many common Google Drive API tasks. It is an actively
+maintained fork of `https://pypi.python.org/pypi/PyDrive <https://pypi.python.org/pypi/PyDrive>`_.
 
 Project Info
 ------------
 
-- Homepage: `https://pypi.python.org/pypi/PyDrive <https://pypi.python.org/pypi/PyDrive>`_
+- Homepage: `https://pypi.python.org/pypi/PyDrive2 <https://pypi.python.org/pypi/PyDrive2>`_
 - Documentation: `Official documentation on GitHub pages <https://gsuitedevs.github.io/PyDrive/docs/build/html/index.html>`_
-- GitHub: `https://github.com/gsuitedevs/PyDrive <https://github.com/gsuitedevs/PyDrive>`_
+- GitHub: `https://github.com/iterative/PyDrive2 <https://github.com/iterative/PyDrive2>`_
 
-Features of PyDrive
+Features of PyDrive2
 -------------------
 
 -  Simplifies OAuth2.0 into just few lines with flexible settings.
@@ -24,17 +25,17 @@ Features of PyDrive
 How to install
 --------------
 
-You can install PyDrive with regular ``pip`` command.
+You can install PyDrive2 with regular ``pip`` command.
 
 ::
 
-    $ pip install PyDrive
+    $ pip install PyDrive2
 
 To install the current development version from GitHub, use:
 
 ::
 
-    $  pip install git+https://github.com/gsuitedevs/PyDrive.git#egg=PyDrive
+    $  pip install git+https://github.com/iterative/PyDrive2.git#egg=PyDrive2
 
 OAuth made easy
 ---------------
@@ -46,8 +47,8 @@ file *settings.yaml*.
 .. code:: python
 
 
-    from pydrive.auth import GoogleAuth
-    from pydrive.drive import GoogleDrive
+    from pydrive2.auth import GoogleAuth
+    from pydrive2.drive import GoogleDrive
 
     gauth = GoogleAuth()
     gauth.LocalWebserverAuth()
@@ -57,7 +58,7 @@ file *settings.yaml*.
 File management made easy
 -------------------------
 
-Upload/update the file with one method. PyDrive will do it in the most
+Upload/update the file with one method. PyDrive2 will do it in the most
 efficient way.
 
 .. code:: python
@@ -91,7 +92,7 @@ efficient way.
 File listing pagination made easy
 ---------------------------------
 
-*PyDrive* handles file listing pagination for you.
+*PyDrive2* handles file listing pagination for you.
 
 .. code:: python
 

examples/strip_bom_example.py

@@ -1,5 +1,5 @@
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
 
 # Authenticate the client.
 gauth = GoogleAuth()

examples/using_folders.py

@@ -1,5 +1,5 @@
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
 
 gauth = GoogleAuth()
 gauth.LocalWebserverAuth()

pydrive/__init__.py renamed to pydrive2/__init__.py

@@ -11,7 +11,7 @@ def __init__(self, auth=None):
     """Create an instance of GoogleDrive.
 
     :param auth: authorized GoogleAuth instance.
-    :type auth: pydrive.auth.GoogleAuth.
+    :type auth: pydrive2.auth.GoogleAuth.
     """
     ApiAttributeMixin.__init__(self)
     self.auth = auth
@@ -23,7 +23,7 @@ def CreateFile(self, metadata=None):
 
     :param metadata: file resource to initialize GoogleDriveFile with.
     :type metadata: dict.
-    :returns: pydrive.files.GoogleDriveFile -- initialized with auth of this instance.
+    :returns: pydrive2.files.GoogleDriveFile -- initialized with auth of this instance.
     """
     return GoogleDriveFile(auth=self.auth, metadata=metadata)
 
@@ -34,7 +34,7 @@ def ListFile(self, param=None):
 
     :param param: parameter to be sent to Files.List().
     :type param: dict.
-    :returns: pydrive.files.GoogleDriveFileList -- initialized with auth of this instance.
+    :returns: pydrive2.files.GoogleDriveFileList -- initialized with auth of this instance.
     """
     return GoogleDriveFileList(auth=self.auth, param=param)
 

pydrive/apiattr.py renamed to pydrive2/apiattr.py

@@ -58,7 +58,7 @@ def __init__(self, auth=None, param=None):
   def _GetList(self):
     """Overwritten method which actually makes API call to list files.
 
-    :returns: list -- list of pydrive.files.GoogleDriveFile.
+    :returns: list -- list of pydrive2.files.GoogleDriveFile.
     """
     # Teamdrive support
     self['corpus'] = 'DEFAULT'
@@ -92,7 +92,7 @@ def __init__(self, auth=None, metadata=None, uploaded=False):
     """Create an instance of GoogleDriveFile.
 
     :param auth: authorized GoogleAuth instance.
-    :type auth: pydrive.auth.GoogleAuth
+    :type auth: pydrive2.auth.GoogleAuth
     :param metadata: file resource to initialize GoogleDriveFile with.
     :type metadata: dict.
     :param uploaded: True if this file is confirmed to be uploaded.

pydrive/auth.py renamed to pydrive2/auth.py

@@ -1,7 +1,7 @@
 import unittest
 
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
 
 class ApiAttributeTest(unittest.TestCase):
     """Test ApiAttr functions.
@@ -31,4 +31,4 @@ def tearDown(self):
         self.file1.Delete()
 
 if __name__ == '__main__':
-    unittest.main()
+    unittest.main()

pydrive/drive.py renamed to pydrive2/drive.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import unittest
 
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
 
 
 class GoogleDriveTest(unittest.TestCase):

pydrive/files.py renamed to pydrive2/files.py

@@ -8,9 +8,9 @@
 import timeout_decorator
 from concurrent.futures import ThreadPoolExecutor, as_completed
 
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
-from pydrive.files import ApiRequestError, GoogleDriveFile
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
+from pydrive2.files import ApiRequestError, GoogleDriveFile
 
 import test_util
 

pydrive/settings.py renamed to pydrive2/settings.py

@@ -3,9 +3,9 @@
 import sys
 import unittest
 
-from pydrive.auth import GoogleAuth
-from pydrive.drive import GoogleDrive
-from pydrive.test import test_util
+from pydrive2.auth import GoogleAuth
+from pydrive2.drive import GoogleDrive
+from pydrive2.test import test_util
 
 
 class GoogleDriveFileListTest(unittest.TestCase):

pydrive/test/README.rst renamed to pydrive2/test/README.rst

@@ -2,7 +2,7 @@
 import os
 import time
 
-from pydrive.auth import GoogleAuth
+from pydrive2.auth import GoogleAuth
 
 class GoogleAuthTest(unittest.TestCase):
   """Tests basic OAuth2 operations of auth.GoogleAuth."""

pydrive/test/__init__.py renamed to pydrive2/test/__init__.py

@@ -1,16 +1,16 @@
 from setuptools import setup
 
 setup(
-    name='PyDrive',
-    version='1.3.1',
+    name='PyDrive2',
+    version='1.4.0',
     author='JunYoung Gwak',
     author_email='[email protected]',
-    maintainer='Robin Nabel',
-    maintainer_email='[email protected]',
-    packages=['pydrive', 'pydrive.test'],
-    url='https://github.com/gsuitedevs/PyDrive',
-    license='LICENSE',
-    description='Google Drive API made easy.',
+    maintainer='DVC team',
+    maintainer_email='[email protected]',
+    packages=['pydrive2', 'pydrive2.test'],
+    url='https://github.com/iterative/PyDrive2',
+    license='Apache License 2.0',
+    description='Google Drive API made easy. Maintained fork of PyDrive.',
     long_description=open('README.rst').read(),
     install_requires=[
         "google-api-python-client >= 1.2",

pydrive/test/settings/default.yaml renamed to pydrive2/test/settings/default.yaml

@@ -2,7 +2,7 @@
 envlist = py26, py27, py33, py34
 
 [testenv]
-changedir = {toxinidir}/pydrive/test
+changedir = {toxinidir}/pydrive2/test
 deps =
     pytest
     httplib2