Author: chrisz
Date: Thu May 1 08:53:35 2008
New Revision: 4553
URL: http://trac.turbogears.org/changeset/4553
Log:
Eased restrictions for SO versions. If there are any issues with certain SO/SA
versions, then there should be tests revealing these issues and version
restrictions should be accompanied by comments explaining why they have been
put in place.
Modified:
branches/1.0/setup.py
branches/1.1/setup.py
Modified: branches/1.0/setup.py
==============================================================================
--- branches/1.0/setup.py (original)
+++ branches/1.0/setup.py Thu May 1 08:53:35 2008
@@ -13,7 +13,7 @@
# setup params
install_requires = [
- "CherryPy >= 2.3.0,<3.0.0alpha",
+ "CherryPy >= 2.3.0, < 3.0.0alpha",
"ConfigObj >= 4.3.2",
"DecoratorTools >= 1.4",
"FormEncode >= 0.7.1",
@@ -29,29 +29,24 @@
exp = ["TGFastData"]
future = [
- "Elixir>=0.4.0",
- "Genshi>=0.4.4",
+ "Elixir >= 0.4.0",
+ "Genshi >= 0.4.4",
]
-if sys.version_info < (2, 5):
- sqlobject = [
- "SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99",
- ]
-else:
- sqlobject = [
- "SQLObject>=0.8,<=0.10.0"
- ]
+sqlobject = [
+ "SQLObject >= 0.7.1"
+]
sqlalchemy = [
"SQLAlchemy >= 0.3.10",
]
testtools = [
- "nose >= 0.9.3,<=0.10.0a1",
+ "nose >= 0.9.3, <= 0.10.0a1",
]
tgtesttools = [
- "nose >= 0.9.3,<=0.10.0a1",
+ "nose >= 0.9.3, <= 0.10.0a1",
"SQLAlchemy >= 0.3.10",
]
@@ -66,7 +61,7 @@
])
else:
# currently there are no extra requires for Python >= 2.5
- ##install_requires.extend([])
+ # install_requires.extend([])
pass
Modified: branches/1.1/setup.py
==============================================================================
--- branches/1.1/setup.py (original)
+++ branches/1.1/setup.py Thu May 1 08:53:35 2008
@@ -31,11 +31,9 @@
"TurboKid >= 1.0.4",
]
-
-if sys.version_info < (2, 5):
- sqlobject = ["SQLObject >= 0.7.1, < 0.10.0"]
-else:
- sqlobject = ["SQLObject >= 0.8, <= 0.10.0"]
+sqlobject = [
+ "SQLObject >= 0.7.1"
+]
exp = ["TGFastData"]
