From 51df8d8cbe96986e002d211291f37c75afbc3ab3 Mon Sep 17 00:00:00 2001 From: rocky Date: Sat, 14 May 2016 15:28:16 -0400 Subject: [PATCH] See if travis will take spark 1.2.1 --- __pkginfo__.py | 14 +++++++++++--- requirements.txt | 2 +- setup.py | 6 ++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/__pkginfo__.py b/__pkginfo__.py index e5f5d9ce..ab009c51 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -36,7 +36,7 @@ entry_points={ 'pydisassemble=uncompyle6.bin.pydisassemble:main', ]} ftp_url = None -install_requires = ['spark-parser >= 1.1.1'] +install_requires = ['spark-parser >= 1.2.1'] license = 'MIT' mailing_list = 'python-debugger@googlegroups.com' modname = 'uncompyle6' @@ -49,7 +49,15 @@ zip_safe = True import os.path -def read(*rnames): - return open(os.path.join(os.path.dirname(__file__), *rnames)).read() +def get_srcdir(): + filename = os.path.normcase(os.path.dirname(os.path.abspath(__file__))) + return os.path.realpath(filename) +srcdir = get_srcdir() + +def read(*rnames): + return open(os.path.join(srcdir, *rnames)).read() + +# Get info from files; set: long_description and VERSION long_description = ( read("README.rst") + '\n' ) +exec(read('uncompyle6/version.py')) diff --git a/requirements.txt b/requirements.txt index 1c0ebb2b..b55b7ef8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -spark-parser >= 1.1.1 +spark-parser >= 1.2.1 diff --git a/setup.py b/setup.py index 365a4674..06e63eeb 100755 --- a/setup.py +++ b/setup.py @@ -6,12 +6,10 @@ from __pkginfo__ import \ author, author_email, install_requires, \ license, long_description, classifiers, \ entry_points, modname, py_modules, \ - short_desc, web, zip_safe + short_desc, VERSION, web, \ + zip_safe from setuptools import setup, find_packages - -exec(open('uncompyle6/version.py').read()) - setup( author = author, author_email = author_email,