Upgrade Python + Django (#69)

Author: pembo13

.gitignore

@@ -21,4 +21,6 @@ dbdb_io/settings.py
 media
 .env
 static-live
-data/xapian
+
+data/db.sqlite3.*
+data/xapian

.travis.yml

@@ -2,17 +2,14 @@ language: python
 python:
   - "3.6"
 install:
-  - mkdir -p media/logos media/twitter
-  - sudo apt-get install python3-sphinx
-  - pip3 install Sphinx
-  - ./install_xapian.sh 1.4.9
-  - pip install git+https://github.com/notanumber/xapian-haystack.git
   - mkdir -p data/xapian
+  - mkdir -p media/logos
+  - mkdir -p media/twitter
+  - pip3 install -U pip setuptools wheel
+  - ./bin/install_xapian.sh 1.4.16
   - pip3 install -r requirements.txt
   - pip3 install -r requirements-test.txt
 before_script:
   - python manage.py migrate
-
 script:
   - python manage.py test
-  

README.md

@@ -1,5 +1,11 @@
 [![Build Status](https://travis-ci.org/cmu-db/dbdb.io.svg?branch=master)](https://travis-ci.org/cmu-db/dbdb.io)
 
-Database of Databases
-=====================
+# Database of Databases
+
+## Installation
+Assumes installation within a virtual directory
+
+ 1. `pip install -U pip setuptools`
+ 2. `./bin/install_xapian.sh 1.4.14`
+ 3. `pip install -U -r requirements.txt`
 

install_xapian.sh renamed to bin/install_xapian.sh

@@ -45,12 +45,12 @@ class SystemVersionAdmin(admin.ModelAdmin):
     list_display = ('system', 'ver', 'creator', 'created')
     list_filter = ['created', 'system']
     readonly_fields=('ver', )
-    
+
 class SystemACLAdmin(admin.ModelAdmin):
     list_display = ('system', 'user', 'created', 'modified')
     list_filter = ['created']
     readonly_fields=('created', 'modified')
-    
+
 class SystemRecommendationAdmin(admin.ModelAdmin):
     list_display = ('system', 'recommendation', 'score', 'created')
     list_filter = ['created', 'system']

dbdb/core/admin.py

@@ -49,7 +49,7 @@ def clean(self, value):
             cit_url, _ = CitationUrl.objects.get_or_create(url=url)
             url_objs.append(cit_url)
         return url_objs
-    
+
     pass
 
 
@@ -132,13 +132,13 @@ def __init__(self, *args, **kwargs):
                 initial=initial_cit,
                 required=False
             )
-            
+
             self.fields[feature.label+'_choices'].feature_id = feature.id
             self.fields[feature.label+'_description'].feature_id = feature.id
             self.fields[feature.label+'_citation'].feature_id = feature.id
             pass
         return
-        
+
     pass
 
 
@@ -191,11 +191,11 @@ class SystemForm(forms.ModelForm):
 
     # This is only shown to non-superusers
     orig_name = forms.CharField(max_length=128, label="Name", disabled=True, required=False)
-    
+
     class Meta:
         model = System
         fields = ['name','orig_name']
-    
+
     pass
 
 class SystemVersionEditForm(forms.ModelForm):
@@ -220,7 +220,7 @@ class SystemVersionEditForm(forms.ModelForm):
         help_text="Separate the urls with commas",
         required=False
     )
-    
+
     class Meta:
         model = SystemVersion
         fields = [
@@ -245,7 +245,7 @@ class Meta:
             'former_names',
             'comment'
         ]
-    
+
     pass
 
 class SystemVersionForm(forms.ModelForm):

dbdb/core/forms.py

@@ -24,23 +24,23 @@ def handle(self, *args, **options):
         meta_fields = set(meta_fields) - set([
             "systemversion",
         ])
-        
-        
+
+
         for ver in SystemVersion.objects.filter(is_current=True):
             print(ver)
             score = 0
-            
+
             for field in sorted(version_fields):
                 val = getattr(ver, field)
                 if field.endswith("_citations"):
                     print(" +", field, "=>", val)
                     score += self.CITATION_REWARD
-                
+
                 elif not val is None and val != '':
                     score += self.FIELD_REWARD
                     print(" +", field)
             # FOR
-            
+
             for field in sorted(meta_fields):
                 val = getattr(ver.meta, field)
                 if not val is None and val != '':

dbdb/core/management/commands/compute_score.py

@@ -14,7 +14,7 @@
 from dbdb.core.views import EmptyFieldsView
 
 class Command(BaseCommand):
-    
+
     def add_arguments(self, parser):
         parser.add_argument('--system', type=str)
         parser.add_argument('--missing', action='store_true')
@@ -23,22 +23,22 @@ def add_arguments(self, parser):
     def handle(self, *args, **options):
         template = os.path.join(settings.BASE_DIR, "static", settings.TWITTER_CARD_TEMPLATE)
         assert os.path.exists(template), "Missing: " + template
-        
+
         versions = SystemVersion.objects.filter(is_current=True)
         if options['system']:
             keyword = options['system']
-            
+
             if keyword.isdigit():
                 versions = versions.filter(system__id=int(keyword))
             else:
                 versions = versions.filter(system__name__icontains=keyword)
-        
+
         for ver in versions:
             card_img = os.path.join(settings.TWITTER_CARD_ROOT, ver.get_twitter_card_image())
             if options['missing'] and os.path.exists(card_img): continue
             ver.create_twitter_card()
             self.stdout.write("%s -> %s" % (ver.system.name, card_img))
-            
+
         # FOR
         return
 

dbdb/core/management/commands/create_twitter_cards.py

@@ -15,7 +15,7 @@ def handle(self, *args, **options):
         User = get_user_model()
         for user in User.objects.all():
             if user.username == "developer" or user.is_superuser: continue
-            
+
             systems = set()
             # Find what systems this user has editted
             for ver in SystemVersion.objects.filter(creator=user):

dbdb/core/management/commands/fix_acls.py

@@ -26,7 +26,7 @@ class Command(BaseCommand):
 
     help = '''Creates a fixture based on the files on initial_data folder
     This should be run only for a newly created system deployment and if there's no better database dump to apply.
-    
+
     Please be sure you have a databasees.csv file in initial_data folder along with spring2017 and spring2016
     '''
 
@@ -39,7 +39,7 @@ def handle(self, *args, **options):
         path_csv = os.path.join(settings.BASE_DIR, 'data', 'initial_data', 'databases.csv')
         path_sp2016 = os.path.join(settings.BASE_DIR, 'data', 'initial_data', 'spring2016')
         path_sp2017 = os.path.join(settings.BASE_DIR, 'data', 'initial_data', 'spring2017')
-        
+
         with transaction.atomic():
             # create initial account
             User = get_user_model()