From e9bf937de313038db83335d52ae6f0d9deb397ea Mon Sep 17 00:00:00 2001 From: Ugurcan Ergun Date: Fri, 28 Dec 2012 01:59:29 +0200 Subject: [PATCH 1/4] https://github.com/arskom/spynepi/issues/14 fix --- CHANGELOG => CHANGELOG.rst | 0 MANIFEST.in | 2 +- setup.py | 7 +++++++ 3 files changed, 8 insertions(+), 1 deletion(-) rename CHANGELOG => CHANGELOG.rst (100%) diff --git a/CHANGELOG b/CHANGELOG.rst similarity index 100% rename from CHANGELOG rename to CHANGELOG.rst diff --git a/MANIFEST.in b/MANIFEST.in index 1009dea..f711729 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ recursive-include spynepi/const/template/* -include CHANGELOG +include CHANGELOG.rst diff --git a/setup.py b/setup.py index 1d99414..b1953d5 100755 --- a/setup.py +++ b/setup.py @@ -11,11 +11,18 @@ v = open(os.path.join(os.path.dirname(__file__), PROJECT_NAME, '__init__.py'), 'r') VERSION = re.match(r".*__version__ = '(.*?)'", v.read(), re.S).group(1) +try: + os.stat('CHANGELOG.rst') + LONG_DESC = open('CHANGELOG.rst', 'r').read() +except OSError: + pass + setup( name=PROJECT_NAME, packages=find_packages(), version=VERSION, description="This is a caching PyPI implementation that uses spyne", + long_description=LONG_DESC, classifiers=[ 'Programming Language :: Python', 'Programming Language :: Python :: 2.7', From ddfab65825bda16e89fed5ea2ebedd4e0232c485 Mon Sep 17 00:00:00 2001 From: Ugurcan Ergun Date: Fri, 28 Dec 2012 13:12:21 +0200 Subject: [PATCH 2/4] Added forgotten definition --- setup.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/setup.py b/setup.py index b1953d5..748b477 100755 --- a/setup.py +++ b/setup.py @@ -11,6 +11,8 @@ v = open(os.path.join(os.path.dirname(__file__), PROJECT_NAME, '__init__.py'), 'r') VERSION = re.match(r".*__version__ = '(.*?)'", v.read(), re.S).group(1) +LONG_DESC = "" + try: os.stat('CHANGELOG.rst') LONG_DESC = open('CHANGELOG.rst', 'r').read() From 4fc5c4ede1bdb259346dcd8f0e9bbd2d56504f25 Mon Sep 17 00:00:00 2001 From: Ugurcan Ergun Date: Fri, 28 Dec 2012 16:54:07 +0200 Subject: [PATCH 3/4] temprorary setup.py change --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 748b477..fd33301 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ license='GPL', install_requires=[ - "spyne>=2.10", "sqlalchemy<0.8", "werkzeug", "twisted", + "spyne>=2.9","sqlalchemy<0.8", "werkzeug", "twisted", ], include_package_data=True, entry_points = { From a3a34bfe459e29f2970be7d8c7d23d5128c697df Mon Sep 17 00:00:00 2001 From: Ugurcan Ergun Date: Fri, 28 Dec 2012 17:33:41 +0200 Subject: [PATCH 4/4] Template could be found now and spynepi_daemon works again --- MANIFEST.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MANIFEST.in b/MANIFEST.in index f711729..c89f573 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,2 @@ -recursive-include spynepi/const/template/* +recursive-include spynepi/const/template *.html include CHANGELOG.rst