version

edsu · edsu · commit 9237ef7b6ee2 · 2021-04-06T21:23:49.000-04:00
Adds a version subcommand to print out the current version of the
installed twarc. I put the version string in a separate module so it
could be used by setup.py without pulling in all of twarc (which could
fail due to missing dependencies) and also to avoid a circular
dependency between twarc/__init__.py and twarc/client2.py
diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 import sys
 import setuptools
 
-version = 'v2.0.0'
+from twarc.version import version
 
 with open("docs/README.md") as f:
     long_description = f.read()
diff --git a/twarc/__init__.py b/twarc/__init__.py
@@ -1,4 +1,3 @@
-__version__ = '2.0.0'
-
+from .version import version
 from .client import Twarc
 from .client2 import Twarc2
diff --git a/twarc/command.py b/twarc/command.py
@@ -11,7 +11,7 @@
 import argparse
 import fileinput
 
-from twarc import __version__
+from twarc.version import version
 from twarc.client import Twarc
 from twarc.json2csv import csv, get_headings, get_row
 from dateutil.parser import parse as parse_dt
@@ -73,7 +73,7 @@ def stop(signal, frame):
     signal.signal(signal.SIGINT, stop)
 
     if command == "version":
-        print("twarc v%s" % __version__)
+        print("twarc v%s" % version)
         sys.exit()
     elif command == "help" or not command:
         parser.print_help()
diff --git a/twarc/command2.py b/twarc/command2.py
@@ -15,6 +15,8 @@
 
 from click_plugins import with_plugins
 from pkg_resources import iter_entry_points
+
+from twarc.version import version
 from twarc.handshake import handshake
 from twarc.decorators import cli_api_error
 from twarc.expansions import flatten as flat
@@ -124,6 +126,14 @@ def configure(ctx):
     ctx.exit()
 
 
+@twarc2.command('version')
+def get_version():
+    """
+    Return the version of twarc that is installed.
+    """
+    click.echo(f'twarc v{version}')
+
+
 @twarc2.command('search')
 @click.option('--since-id', type=int,
     help='Match tweets sent after tweet id')
diff --git a/twarc/version.py b/twarc/version.py
@@ -0,0 +1 @@
+version = '2.0.0'
