diff --git a/readthedocs/projects/constants.py b/readthedocs/projects/constants.py index d71d9930be3..50ee50327fe 100644 --- a/readthedocs/projects/constants.py +++ b/readthedocs/projects/constants.py @@ -84,3 +84,11 @@ IMPORTANT_VERSION_FILTERS = { 'slug': 'important' } + +# in the future this constant can be replaced with a implementation that +# detect all available Python interpreters in the fly (Maybe using +# update-alternatives linux tool family?). +PYTHON_CHOICES = ( + ('python', _('Python')), + ('python3', _('Python 3.x')), +) diff --git a/readthedocs/projects/forms.py b/readthedocs/projects/forms.py index 94eeee0668a..425276c01f8 100644 --- a/readthedocs/projects/forms.py +++ b/readthedocs/projects/forms.py @@ -28,6 +28,11 @@ class ImportProjectForm(ProjectForm): repo = forms.CharField(required=True, help_text=_(u'URL for your code (hg or git). Ex. http://github.com/ericholscher/django-kong.git')) + python_interpreter = forms.ChoiceField( + choices=constants.PYTHON_CHOICES, initial='python', + help_text=_("""(Beta) The Python interpreter used to create the virtual + environment.""")) + class Meta: model = Project fields = ( @@ -39,6 +44,7 @@ class Meta: 'privacy_level', 'version_privacy_level', # Python specific 'use_virtualenv', 'use_system_packages', 'requirements_file', + 'python_interpreter', # Fringe 'analytics_code', 'documentation_type', 'tags' ) diff --git a/readthedocs/projects/migrations/0031_add_project_interpreter.py b/readthedocs/projects/migrations/0031_add_project_interpreter.py new file mode 100644 index 00000000000..5125c86b192 --- /dev/null +++ b/readthedocs/projects/migrations/0031_add_project_interpreter.py @@ -0,0 +1,133 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + "Write your forwards methods here." + # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..." + db.add_column('projects_project', 'python_interpreter', self.gf('django.db.models.fields.CharField')(default='python', max_length=20), keep_default=False) + + def backwards(self, orm): + "Write your backwards methods here." + db.delete_column('projects_project', 'python_interpreter') + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'builds.version': { + 'Meta': {'ordering': "['-verbose_name']", 'unique_together': "[('project', 'slug')]", 'object_name': 'Version'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'built': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identifier': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'privacy_level': ('django.db.models.fields.CharField', [], {'default': "'public'", 'max_length': '20'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'versions'", 'to': "orm['projects.Project']"}), + 'slug': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'uploaded': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'verbose_name': ('django.db.models.fields.CharField', [], {'max_length': '255'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'projects.importedfile': { + 'Meta': {'object_name': 'ImportedFile'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'md5': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'project': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'imported_files'", 'to': "orm['projects.Project']"}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '50'}), + 'version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'imported_filed'", 'null': 'True', 'to': "orm['builds.Version']"}) + }, + 'projects.project': { + 'Meta': {'ordering': "('slug',)", 'object_name': 'Project'}, + 'analytics_code': ('django.db.models.fields.CharField', [], {'max_length': '50', 'null': 'True', 'blank': 'True'}), + 'conf_py_file': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'copyright': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'crate_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'default_branch': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'default_version': ('django.db.models.fields.CharField', [], {'default': "'latest'", 'max_length': '255'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'django_packages_url': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'documentation_type': ('django.db.models.fields.CharField', [], {'default': "'sphinx'", 'max_length': '20'}), + 'featured': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'modified_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'path': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'privacy_level': ('django.db.models.fields.CharField', [], {'default': "'public'", 'max_length': '20'}), + 'project_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'blank': 'True'}), + 'pub_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'python_interpreter': ('django.db.models.fields.CharField', [], {'default': "'python'", 'max_length': '20'}), + 'related_projects': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['projects.Project']", 'null': 'True', 'through': "orm['projects.ProjectRelationship']", 'blank': 'True'}), + 'repo': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'repo_type': ('django.db.models.fields.CharField', [], {'default': "'git'", 'max_length': '10'}), + 'requirements_file': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'skip': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '255'}), + 'suffix': ('django.db.models.fields.CharField', [], {'default': "'.rst'", 'max_length': '10'}), + 'theme': ('django.db.models.fields.CharField', [], {'default': "'default'", 'max_length': '20'}), + 'use_system_packages': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'use_virtualenv': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'users': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'projects'", 'symmetrical': 'False', 'to': "orm['auth.User']"}), + 'version': ('django.db.models.fields.CharField', [], {'max_length': '100', 'blank': 'True'}), + 'version_privacy_level': ('django.db.models.fields.CharField', [], {'default': "'public'", 'max_length': '20'}) + }, + 'projects.projectrelationship': { + 'Meta': {'object_name': 'ProjectRelationship'}, + 'child': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'superprojects'", 'to': "orm['projects.Project']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'subprojects'", 'to': "orm['projects.Project']"}) + }, + 'taggit.tag': { + 'Meta': {'object_name': 'Tag'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '100'}) + }, + 'taggit.taggeditem': { + 'Meta': {'object_name': 'TaggedItem'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_tagged_items'", 'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}), + 'tag': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'taggit_taggeditem_items'", 'to': "orm['taggit.Tag']"}) + } + } + + complete_apps = ['projects'] + symmetrical = True diff --git a/readthedocs/projects/models.py b/readthedocs/projects/models.py index d370618a6a8..4abf690169e 100644 --- a/readthedocs/projects/models.py +++ b/readthedocs/projects/models.py @@ -123,6 +123,17 @@ class Project(models.Model): skip = models.BooleanField(_('Skip')) use_virtualenv = models.BooleanField(_('Use virtualenv'), help_text=_("Install your project inside a virtualenv using setup.py install")) + + # + # this model attribute hold the python interpreter used to create the + # virtual environment (therefore the interpreter used on the virtual + # environment) + # + python_interpreter = models.CharField(_('Python Interpreter'), max_length=20, + choices=constants.PYTHON_CHOICES, default='python', + help_text=_("""(Beta) The Python interpreter used to create the virtual + environment.""")) + use_system_packages = models.BooleanField(_('Use system packages'), help_text=_("Give the virtual environment access to the global sites-packages dir")) django_packages_url = models.CharField(_('Django Packages URL'), max_length=255, blank=True) diff --git a/readthedocs/projects/tasks.py b/readthedocs/projects/tasks.py index 667b5702559..a6a84361e4b 100644 --- a/readthedocs/projects/tasks.py +++ b/readthedocs/projects/tasks.py @@ -300,8 +300,11 @@ def update_imported_docs(version_pk): site_packages = '--system-site-packages' else: site_packages = '--no-site-packages' + # Here the command has been modified to support different + # interpreters. update_docs_output['venv'] = run('{cmd} --distribute {site_packages} {path}'.format( - cmd='virtualenv', + cmd='{interpreter} -m virtualenv'.format( + interpreter=project.python_version), site_packages=site_packages, path=project.venv_path(version=version_slug))) # Other code expects sphinx-build to be installed inside the virtualenv.