back to setup.py now that we have devpi

requirements.txt

@@ -1,11 +0,0 @@
-certauth>=1.1.0
-git+https://github.com/internetarchive/warctools.git
-kafka-python
-
-git+https://github.com/nlevitt/surt.git@py3
-git+https://github.com/nlevitt/rethinkstuff.git
-.
-
-# -e /home/nlevitt/workspace/surt
-# -e /home/nlevitt/workspace/rethinkstuff
-# -e .

setup.py

@@ -10,13 +10,8 @@ VERSION_BYTES = b'1.5'
 def full_version_bytes():
     import subprocess, time
     try:
-        commit_bytes = subprocess.check_output(['git', 'log', '-1', '--pretty=format:%h'])
+        commit_num_bytes = subprocess.check_output(['git', 'rev-list', '--count', 'HEAD']).strip()
-
+        return VERSION_BYTES + b'.' + commit_num_bytes
-        t_bytes = subprocess.check_output(['git', 'log', '-1', '--pretty=format:%ct'])
-        t = int(t_bytes.strip().decode('utf-8'))
-        tm = time.gmtime(t)
-        timestamp_utc = time.strftime("%Y%m%d%H%M%S", time.gmtime(t))
-        return VERSION_BYTES + b'-' + timestamp_utc.encode('utf-8') + b'-' + commit_bytes.strip()
     except subprocess.CalledProcessError:
         return VERSION_BYTES
 
@@ -47,6 +42,13 @@ setuptools.setup(name='warcprox',
         license='GPL',
         packages=['warcprox'],
         package_data={'warcprox':['version.txt']},
+        install_requires=[
+            'certauth>=1.1.0',
+            'warctools',
+            'kafka-python',
+            'surt',
+            'rethinkstuff',
+            ],
         tests_require=['requests>=2.0.1', 'pytest'],  # >=2.0.1 for https://github.com/kennethreitz/requests/pull/1636
         cmdclass = {'test': PyTest},
         test_suite='warcprox.tests',