Commits

Georg Brandl committed 9ffed50

Invert setup.py uuid logic.

Comments (0)

Files changed (1)

 <http://bitbucket.org/birkenfeld/sphinx/get/tip.gz#egg=Sphinx-dev>`_.
 '''
 
-requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5', 'uuid>=1.30']
+requires = ['Pygments>=0.8', 'Jinja2>=2.2', 'docutils>=0.5']
 
 if sys.version_info < (2, 4):
     print('ERROR: Sphinx requires at least Python 2.4 to run.')
     except:
         pass
     else:
-        del requires[-2]
-elif sys.version_info >= (2, 5):
-    # An uuid module has been added to the stdlib in 2.5
-    del requires[-1]
+        del requires[-1]
+
+    # The uuid module is new in the stdlib in 2.5
+    requires.append('uuid>=1.30')
 
 
 # Provide a "compile_catalog" command that also creates the translated
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.