浏览代码

more fixes due to pip install broken from pypi

Oz N Tiram 9 年之前
父节点
当前提交
22607a2c73
共有 4 个文件被更改,包括 11 次插入10 次删除
  1. 2 2
      Makefile
  2. 6 4
      pwman/__init__.py
  3. 2 3
      pwman/ui/cli.py
  4. 1 1
      setup.py

+ 2 - 2
Makefile

@@ -12,7 +12,7 @@ help:
 	@echo "dist - package"
 
 clean_all:
-	clean 
+	clean
 	clean_docs
 	clean_coverage_report
 
@@ -76,4 +76,4 @@ dist: clean
 
 install:
 	pip uninstall -y pwman3
-	python setup.py -q install 
+	pip install -e .

+ 6 - 4
pwman/__init__.py

@@ -57,7 +57,8 @@ try:
     long_description = pkg_meta.description
 except IOError as E:
     # this should only happen once when installing the package
-    pass
+    description = "a command line password manager with support for multiple databases."
+    website = 'http://pwman3.github.io/pwman3/'
 
 
 def which(cmd):  # pragma: no cover
@@ -73,9 +74,10 @@ config_dir = os.path.expanduser("~/.pwman")
 
 
 def parser_options(formatter_class=argparse.HelpFormatter):  # pragma: no cover
-    parser = argparse.ArgumentParser(prog=appname,
-                                     description=description,
-                                     formatter_class=formatter_class)
+    parser = argparse.ArgumentParser(
+            prog='pwman3',
+            description=description,
+            formatter_class=formatter_class)
     parser.add_argument('-c', '--config', dest='cfile',
                         default=os.path.expanduser("~/.pwman/config"),
                         help='cofiguration file to read')

+ 2 - 3
pwman/ui/cli.py

@@ -33,7 +33,7 @@ except ImportError as e:  # pragma: no cover
 
 
 from pwman.ui.baseui import BaseCommands
-from pwman import (get_conf_options, get_db_version, version, pkg_meta, parser_options)
+from pwman import (get_conf_options, get_db_version, version, website, parser_options)
 from pwman.ui.tools import CLICallback
 from pwman.data import factory
 from pwman.exchange.importer import Importer
@@ -53,8 +53,7 @@ class PwmanCli(cmd.Cmd, BaseCommands):
         connecion, see if we have xsel ...
         """
         super(PwmanCli, self).__init__(**kwargs)
-        self.intro = "%s %s (c) visit: %s" % ('pwman3', version,
-                                              pkg_meta.home_page)
+        self.intro = "%s %s (c) visit: %s" % ('pwman3', version, website)
         self._historyfile = config_parser.get_value("Readline", "history")
         self.hasxsel = hasxsel
         self.config = config_parser

+ 1 - 1
setup.py

@@ -13,7 +13,7 @@ from setuptools import find_packages
 import sys
 from setuptools.command.install import install
 import os
-import pwman
+
 
 # The BuildManPage code is distributed
 # under the same License of Python