Allow use of bumper for releases

8 files changed, 43 insertions, 16 deletions

diff --git a/NEWS b/NEWS
index cfd8f2d..5764f8f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 NEWS for dupfiles
 =================
 
+Version 5.8+git, not yet released
+--------------------------------
+
+* Require Python 2.7.
+
 Version 5.8, released 2015-10-18
 --------------------------------
 
diff --git a/debian/changelog b/debian/changelog
index 8783169..c17a09e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dupfiles (5.8+git-1) UNRELEASED; urgency=medium
+
+  * New upstream version.
+  * Require Python 2.7.
+
+ -- Lars Wirzenius <liw@liw.fi>  Sat, 08 Oct 2016 20:47:05 +0300
+
 dupfiles (5.8-1) unstable; urgency=medium
 
   * Force jessie build.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 8b42adc..9dfa319 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,14 @@ Source: dupfiles
 Maintainer: Lars Wirzenius <liw@liw.fi>
 Section: misc
 Priority: optional
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7.3.8), python-all (>= 2.6.6-3~), 
+Standards-Version: 3.8.8
+Build-Depends: debhelper (>= 9), python-all (>= 2.7~), 
     python-cliapp (>= 0.7), python-ttystatus
-X-Python-Version: >= 2.6
+X-Python-Version: >= 2.7
 
 Package: dupfiles
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.6), 
+Depends: ${python:Depends}, ${misc:Depends}, python (>= 2.7),
  python-ttystatus, python-cliapp (>= 0.7)
 Description: find and optionally hard-link duplicate files
  dupfiles finds files with identical content, and either reports them,
diff --git a/dupfiles b/dupfiles
index fb2b123..49f042e 100755
--- a/dupfiles
+++ b/dupfiles
@@ -28,8 +28,7 @@ import sys
 import time
 import ttystatus
 
-
-version = '5.8'
+import dupfileslib
 
 
 class FileStats(object):
@@ -289,5 +288,4 @@ class Dupfiles(cliapp.Application):
 
 
 if __name__ == '__main__':
-    Dupfiles(version=version).run()
-
+    Dupfiles(version=dupfileslib.__version__).run()
diff --git a/dupfileslib/__init__.py b/dupfileslib/__init__.py
new file mode 100644
index 0000000..9edf3d1
--- /dev/null
+++ b/dupfileslib/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2016  Lars Wirzenius
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# =*= License: GPL-3+ =*=
+
+
+from .version import __version__, __version_info__
diff --git a/dupfileslib/version.py b/dupfileslib/version.py
new file mode 100644
index 0000000..e283617
--- /dev/null
+++ b/dupfileslib/version.py
@@ -0,0 +1,2 @@
+__version__ = '5.8+git'
+__version_info__ = (5, 8, '+git')
diff --git a/setup.py b/setup.py
index 2456830..69a1b5b 100644
--- a/setup.py
+++ b/setup.py
@@ -16,21 +16,17 @@
 
 from distutils.core import setup
 import glob
-import subprocess
 
-p = subprocess.Popen(['./dupfiles', '--version'], stdout=subprocess.PIPE)
-out, err = p.communicate()
-if p.returncode != 0:
-    raise Exception('./dupfiles --version failed')
-version = out.splitlines()[0]
+import dupfileslib
 
 setup(
     name='dupfiles',
-    version=version,
+    version=dupfileslib.__version__,
     description='Find duplicate files',
     author='Lars Wirzenius',
     author_email='liw@liw.fi',
     url='http://liw.fi/dupfiles/',
     scripts=['dupfiles'],
+    packages=['dupfileslib'],
     data_files=[('share/man/man1', glob.glob('*.1'))],
 )