Ronny Pfannschmidt avatar Ronny Pfannschmidt committed 7bab5d5 Merge

merge propper handling of recent virtualenv from Simon

Comments (0)

Files changed (2)

 
 def main():
     version = sys.version_info[:2]
-    install_requires = ['virtualenv>=1.6.4', 'py>=1.4.3', ]
+    install_requires = ['virtualenv>=1.7', 'py>=1.4.3', ]
     if version < (2,7) or (3,0) <= version <= (3,1):
         install_requires += ['argparse']
     setup(
     )
 
 if __name__ == '__main__':
-    main()
+    main()
         args = [config_interpreter, venvscript]
         if not self._ispython3() and self.envconfig.distribute:
             args.append('--distribute')
-        if not self.envconfig.sitepackages:
+        if self.envconfig.sitepackages:
+            args.append('--system-site-packages')
+        else:
             args.append('--no-site-packages')
         #if sys.platform == "win32":
         #    f, path, _ = py.std.imp.find_module("virtualenv")
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.