Skip to content
This repository has been archived by the owner on Feb 2, 2022. It is now read-only.

Commit

Permalink
Updated the setup dependencies for dicompyler and copyright informati…
Browse files Browse the repository at this point in the history
…on year to 2014.
  • Loading branch information
bastula committed Jul 11, 2014
1 parent fc2b446 commit db18517
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dicompyler/license.txt
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
4 changes: 2 additions & 2 deletions dicompyler/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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']
Expand Down
2 changes: 1 addition & 1 deletion dicompyler_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
17 changes: 9 additions & 8 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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/
Expand All @@ -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')
Expand All @@ -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
Expand Down Expand Up @@ -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)""",
)

0 comments on commit db18517

Please sign in to comment.