click

edsu · edsu · commit a78220bda6b3 · 2021-02-28T22:13:26.000-05:00
This adds the start of a new command that uses the click module to
manage the twarc command and its various subcommands. At the moment only
sample is supported. You should be able to run the v1.1 API sample like so:

    twarc sample &gt; sample.jsonl

And the v2 currently needs a bearer-token, but that should change in the
future if the bearer-token is fetched automatically given the app keys:

    twarc --v2 sample --bearer-token XXX &gt; sample.jsonl

You can also get the "flattened" output like so:

    twarc --v2 sample --bearer-token XXX --flatten &gt; sample.jsonl

I think the configuration initialization and reading needs to be pulled
out of twarc.client into a new module twarc.config so it can also be
used by twarc.client2?
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+click
 pytest
 python-dateutil
 requests_oauthlib
diff --git a/requirements/python2.txt b/requirements/python2.txt
diff --git a/setup.py b/setup.py
@@ -1,33 +1,29 @@
 import sys
+import twarc
+import setuptools
 
-from os.path import join
-from setuptools import setup
-
-# Also in twarc/__init__.py
-__version__ = '1.12.1'
+version = twarc.__version__
 
 with open("README.md") as f:
     long_description = f.read()
 
-if sys.version_info[0] < 3:
-    dependencies = open(join('requirements', 'python2.txt')).read().split()
-else:
-    dependencies = open(join('requirements', 'python3.txt')).read().split()
+with open("requirements.txt") as f:
+    dependencies = f.read().split()
 
 if __name__ == "__main__":
-    setup(
+    setuptools.setup(
         name='twarc',
-        version=__version__,
+        version=version,
         url='https://github.com/docnow/twarc',
         author='Ed Summers',
         author_email='ehs@pobox.com',
         packages=['twarc', ],
         description='Archive tweets from the command line',
         long_description=long_description,
         long_description_content_type="text/markdown",
-        python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
+        python_requires='>=3.3',
         install_requires=dependencies,
         setup_requires=['pytest-runner'],
         tests_require=['pytest', 'python-dotenv'],
-        entry_points={'console_scripts': ['twarc = twarc:main']}
+        entry_points={'console_scripts': ['twarc = twarc.command:cli']}
     )
diff --git a/twarc/__init__.py b/twarc/__init__.py
@@ -1,5 +1,4 @@
-__version__ = '1.12.1'  # also in setup.py
+__version__ = '2.0.0'
 
 from .client import Twarc
-from .client2 import Twarc2
-from .command import main
+from .client2 import Twarc2
diff --git a/twarc/client.py b/twarc/client.py
@@ -55,6 +55,7 @@ def __init__(self, consumer_key=None, consumer_secret=None,
         be used.
         """
 
+        self.api_version = "1.1"
         self.consumer_key = consumer_key
         self.consumer_secret = consumer_secret
         self.access_token = access_token
diff --git a/twarc/client2.py b/twarc/client2.py
@@ -50,6 +50,7 @@ def __init__(
         - bearer_token: the Twitter API bearer_token for autghe
 
         """
+        self.api_version = "2"
         self.bearer_token = bearer_token
         self.connection_errors = connection_errors
         self.http_errors = http_errors
diff --git a/twarc/command.py b/twarc/command.py

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 +click
 pytest
 python-dateutil
 requests_oauthlib