Jelajahi Sumber

bump version

oz123 10 tahun lalu
induk
melakukan
c7621fee42
2 mengubah file dengan 2 tambahan dan 18 penghapusan
  1. 1 7
      pwman/__init__.py
  2. 1 11
      setup.py

+ 1 - 7
pwman/__init__.py

@@ -19,7 +19,6 @@
 # Copyright (C) 2006 Ivan Kelly <ivan@ivankelly.net>
 # ============================================================================
 import os
-import pkg_resources
 import argparse
 import sys
 import re
@@ -28,12 +27,7 @@ from pwman.util import config
 from pwman.data.factory import check_db_version
 
 appname = "pwman3"
-
-
-try:
-    version = pkg_resources.get_distribution('pwman3').version
-except pkg_resources.DistributionNotFound:  # pragma: no cover
-    version = "0.6"
+version = "0.7"
 
 website = "http://pwman3.github.io/pwman3/"
 author = "Oz Nahum Tiram"

+ 1 - 11
setup.py

@@ -13,7 +13,6 @@ from setuptools import find_packages
 import sys
 from setuptools.command.install import install
 import os
-from subprocess import Popen, PIPE
 import pwman
 
 # The BuildManPage code is distributed
@@ -296,15 +295,6 @@ class ManPageCreator(object):
 sys.path.insert(0, os.getcwd())
 
 
-def describe():
-    des = Popen('git describe', shell=True, stdout=PIPE)
-    ver = des.stdout.readlines()
-    if ver:
-        return ver[0].decode().strip()
-    else:
-        return pwman.version
-
-
 class PyCryptoInstallCommand(install):
 
     """
@@ -329,7 +319,7 @@ class PyCryptoInstallCommand(install):
 
 
 setup(name=pwman.appname,
-      version=describe(),
+      version=pwman.version,
       description=pwman.description,
       long_description=pwman.long_description,
       author=pwman.author,