diff --git a/dicompyler/license.txt b/dicompyler/license.txt index 3af954a..46de086 100644 --- a/dicompyler/license.txt +++ b/dicompyler/license.txt @@ -1,4 +1,4 @@ -Copyright (c) 2009-2012 Aditya Panchal and dicompyler contributors +Copyright (c) 2009-2014 Aditya Panchal and dicompyler contributors All rights reserved. diff --git a/dicompyler/main.py b/dicompyler/main.py index 3dc4f24..3352a51 100644 --- a/dicompyler/main.py +++ b/dicompyler/main.py @@ -2,7 +2,7 @@ # -*- coding: ISO-8859-1 -*- # main.py """Main file for dicompyler.""" -# Copyright (c) 2009-2012 Aditya Panchal +# Copyright (c) 2009-2014 Aditya Panchal # Copyright (c) 2009 Roy Keyes # This file is part of dicompyler, released under a BSD license. # See the file license.txt included with this distribution, also @@ -863,7 +863,7 @@ def OnAbout(self, evt): info = wx.AboutDialogInfo() info.Name = "dicompyler" info.Version = __version__ - info.Copyright = u"© 2009-2012 Aditya Panchal" + info.Copyright = u"© 2009-2014 Aditya Panchal" credits = util.get_credits() info.Developers = credits['developers'] info.Artists = credits['artists'] diff --git a/dicompyler_app.py b/dicompyler_app.py index 6f5f87d..795dd3e 100755 --- a/dicompyler_app.py +++ b/dicompyler_app.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # dicompyler_app.py """Script to start dicompyler without installing from source.""" -# Copyright (c) 2009-2012 Aditya Panchal +# Copyright (c) 2009-2014 Aditya Panchal # This file is part of dicompyler, released under a BSD license. # See the file license.txt included with this distribution, also # available at http://code.google.com/p/dicompyler/ diff --git a/setup.py b/setup.py index 5cb59ab..8e12628 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# dicompyler.py +# setup.py """Setup script for dicompyler.""" -# Copyright (c) 2012 Aditya Panchal +# Copyright (c) 2012-2014 Aditya Panchal # This file is part of dicompyler, relased under a BSD license. # See the file license.txt included with this distribution, also # available at http://code.google.com/p/dicompyler/ @@ -14,10 +14,10 @@ import sys requires = [ - 'matplotlib>=0.99', + 'matplotlib>=0.99, <=1.1.0', 'numpy>=1.2.1', 'pil>=1.1.7', - 'pydicom>=0.9.5',] + 'pydicom>=0.9.5, <0.9.7'] if sys.version_info[0] == 2 and sys.version_info[1] < 6: requires.append('simplejson') @@ -32,6 +32,7 @@ 'baseplugins/*.py', 'baseplugins/*.xrc']}, zip_safe = False, install_requires = requires, + dependency_links=['https://pydicom.googlecode.com/files/pydicom-0.9.6.zip'], entry_points={'console_scripts':['dicompyler = dicompyler.main:start']}, # metadata for upload to PyPI @@ -84,10 +85,10 @@ dicompyler requires the following packages to run from source: - Python 2.5 or higher (not tested on Python 3) - - wxPython 2.8.8.1 or higher - - matplotlib 0.99 or higher + - wxPython 2.8.8.1 to 2.8.10.1 + - matplotlib 0.99 to 1.10 - numpy 1.2.1 or higher - - PIL 1.1.7 or higher - - pydicom 0.9.5 or higher + - PIL 1.1.7 or any version of Pillow + - pydicom 0.9.5 or 0.9.6 - simplejson (only for Python 2.5, Python 2.6+ includes JSON support)""", ) \ No newline at end of file