Merged in several changes from the release branch. People are starting to update versions in trunk, so this will help smooth things out a bit. I'll add that I don't think any version numbers in trunk should be updated from the last release version until and unless more development is done on that project (otherwise there's no reason to increase its version number.

git-svn-id: http://svn.stsci.edu/svn/ssb/stsci_python/stsci_python/trunk/stwcs@13397 fe389314-cf27-0410-b35b-8c050e845b92

2 files changed, 3 insertions, 3 deletions

diff --git a/setup.cfg b/setup.cfg
index d396303..e179423 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,9 +14,9 @@ classifier =
     Topic :: Scientific/Engineering :: Astronomy
     Topic :: Software Development :: Libraries :: Python Modules
 requires-python = >=2.5
-requires-dist = 
+requires-dist =
     stsci.tools (==3.0)
-    pywcs (==1.10-4.7)
+    pywcs (>=1.10)
 
 [files]
 packages_root = lib
diff --git a/setup.py b/setup.py
index f47f563..30dc9b6 100755
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ import setuptools
 setuptools.command.easy_install.easy_install = easier_install
 
 setup(
-    setup_requires=['d2to1>=0.2.3', 'stsci.distutils>=0.2dev'],
+    setup_requires=['d2to1>=0.2.5', 'stsci.distutils==0.2'],
     d2to1=True,
     use_2to3=True,
     zip_safe=False