Classical modular forms

.gitignore

@@ -11,6 +11,7 @@ config.ini
 
 
 flasklog
+slow_queries.log
 
 # Testing files
 htmlcov
@@ -29,3 +30,5 @@ local.sh
 .idea/
 LMFDBinventory.log
 LMFDBtransactions_inv.log
+
+

.travis.yml

@@ -24,8 +24,6 @@ addons:
             - libssl-dev
             # needed for pyflakes
             - python-pip
-            # to have mongo shell
-            - mongodb-org-shell
             # to run nosetests in parallel
             - parallel
 
@@ -48,7 +46,9 @@ install:
     - export MAKE='make -j4'
     - wget  --no-verbose https://storage.googleapis.com/sage-lmfdb/sage-${SAGE_VERSION}-Ubuntu_14.04-x86_64.tar.bz2
     # travis_wait extends the default 10 minute timeout to 30 minutes
-    - travis_wait 30 time tar xf sage-${SAGE_VERSION}-Ubuntu_14.04-x86_64.tar.bz2 -C ${HOME}
+    # what is the load on the server
+    - uptime
+    - travis_wait 40 time tar xf sage-${SAGE_VERSION}-Ubuntu_14.04-x86_64.tar.bz2 -C ${HOME}
 
     # trigger the patch once script
     - ${SAGE} --version > patch_once_log
@@ -58,19 +58,16 @@ install:
     - ${SAGE} -pip install -r requirements.txt
 
 before_script:
-    # assert that m0.lmfdb.xyz accepts our connections
-    - nc -vz  m0.lmfdb.xyz 27017
-    # create a list of files and folder where we will run the tests
-    - ls  lmfdb/*.py  > list
-    - ls -d lmfdb/*/ >> list
+    # assert that devmirror.lmfdb.xyz accepts our connections
+    - nc -vz  devmirror.lmfdb.xyz 5432
     # how much free ram do we have
     - free -m
     # what is the load on the server
     - uptime
 
 script:
     # run pyflakes
-    - pyflakes lmfdb/ > pyflakeslog
+    - pyflakes . > pyflakeslog
     - if [[ $(wc -l < pyflakeslog) != 0 ]]; then echo "ERROR pyflakes failed!"; cat pyflakeslog; else echo "PASS pyflakes is happy!"; fi
     # Check that pytest is installed
     - ${SAGE} -sh -c "pytest --version"

README.md

@@ -21,3 +21,4 @@ Screenshot
 ![LMFDB Screenshot](https://raw.github.com/wiki/LMFDB/lmfdb/lmfdb-screenshot-20120410.png)
 
 [logo]: https://github.com/LMFDB/lmfdb/raw/master/lmfdb/static/images/lmfdb-logo.png "LMFDB"
+

lmfdb/__init__.py

@@ -2,5 +2,7 @@
 
 __version__ = '0.1'
 
-from website import main
-assert main
+#from .website import main
+#assert main
+from .backend.database import db
+assert db

lmfdb/abvar/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from lmfdb.base import app
-from lmfdb.utils import make_logger
+from lmfdb.app import app
+from lmfdb.logger import make_logger
 from flask import Blueprint
 
 abvar_page = Blueprint("abvar", __name__, template_folder='templates', static_folder="static")

lmfdb/abvar/fq/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from lmfdb.base import app
-from lmfdb.utils import make_logger
+from lmfdb.app import app
+from lmfdb.logger import make_logger
 from flask import Blueprint
 
 abvarfq_page = Blueprint("abvarfq", __name__, template_folder='templates', static_folder="static")

lmfdb/abvar/fq/isog_class.py

@@ -3,17 +3,18 @@
 from flask import url_for
 from collections import Counter
 
-from lmfdb.utils import make_logger, encode_plot
+from lmfdb.utils import encode_plot
+from lmfdb.logger import make_logger
 
-from lmfdb.db_backend import db
-from lmfdb.base import app
+from lmfdb import db
+from lmfdb.app import app
 
 from sage.rings.all import Integer, QQ, RR
 from sage.plot.all import line, points, circle, Graphics
 
-from lmfdb.genus2_curves.web_g2c import list_to_factored_poly_otherorder
-from lmfdb.WebNumberField import nf_display_knowl, field_pretty
-from lmfdb.transitive_group import group_display_knowl
+from lmfdb.utils import list_to_factored_poly_otherorder
+from lmfdb.number_fields.web_number_field import nf_display_knowl, field_pretty
+from lmfdb.galois_groups.transitive_group import group_display_knowl
 from lmfdb.abvar.fq.web_abvar import av_display_knowl, av_data#, av_knowl_guts
 
 logger = make_logger("abvarfq")

lmfdb/abvar/fq/main.py

@@ -1,21 +1,24 @@
 # -*- coding: utf-8 -*-
-import re
-import time
-import ast
-import StringIO
-from lmfdb.db_backend import db
-from lmfdb.base import app
-from lmfdb.utils import to_dict, make_logger
-from lmfdb.abvar.fq import abvarfq_page
-from lmfdb.search_parsing import parse_ints, parse_string_start, parse_nf_string, parse_galgrp, parse_subset, parse_submultiset
-from lmfdb.search_wrapper import search_wrap
-from search_parsing import parse_newton_polygon
-from isog_class import validate_label, AbvarFq_isoclass
-from stats import AbvarFqStats
+
+import ast, re, StringIO, time
+
 from flask import flash, render_template, url_for, request, redirect, send_file
 from markupsafe import Markup
 from sage.rings.all import PolynomialRing, ZZ
 
+from lmfdb import db
+from lmfdb.app import app
+from lmfdb.logger import make_logger
+from lmfdb.utils import (
+    to_dict,
+    parse_ints, parse_string_start, parse_nf_string, parse_galgrp,
+    parse_subset, parse_submultiset, parse_bool, parse_bool_unknown,
+    search_wrap)
+from . import abvarfq_page
+from .search_parsing import parse_newton_polygon
+from .isog_class import validate_label, AbvarFq_isoclass
+from .stats import AbvarFqStats
+
 logger = make_logger("abvarfq")
 
 #########################
@@ -162,36 +165,10 @@ def download_search(info):
 def abelian_variety_search(info, query):
     parse_ints(info,query,'q',name='base field')
     parse_ints(info,query,'g',name='dimension')
-    if 'simple' in info:
-        if info['simple'] == 'yes':
-            query['is_simp'] = True
-        elif info['simple'] == 'no':
-            query['is_simp'] = False
-    if 'primitive' in info:
-        if info['primitive'] == 'yes':
-            query['is_prim'] = True
-        elif info['primitive'] == 'no':
-            query['is_prim'] = False
-    if 'jacobian' in info:
-        jac = info['jacobian']
-        if jac == 'yes':
-            query['is_jac'] = 1
-        elif jac == 'not_no':
-            query['is_jac'] = {'$gt' : -1}
-        elif jac == 'not_yes':
-            query['is_jac'] = {'$lt' : 1}
-        elif jac == 'no':
-            query['is_jac'] = -1
-    if 'polarizable' in info:
-        pol = info['polarizable']
-        if pol == 'yes':
-            query['is_pp'] = 1
-        elif pol == 'not_no':
-            query['is_pp'] = {'$gt' : -1}
-        elif pol == 'not_yes':
-            query['is_pp'] = {'$lt' : 1}
-        elif pol == 'no':
-            query['is_pp'] = -1
+    parse_bool(info,query,'simple',qfield='is_simp')
+    parse_bool(info,query,'primitive',qfield='is_prim')
+    parse_bool_unknown(info, query, 'jacobian', qfield='is_jac')
+    parse_bool_unknown(info, query, 'polarizable', qfield='is_pp')
     parse_ints(info,query,'p_rank')
     parse_ints(info,query,'ang_rank')
     parse_newton_polygon(info,query,'newton_polygon',qfield='slps')

lmfdb/abvar/fq/search_parsing.py

@@ -1,6 +1,6 @@
 import re
 from sage.all import QQ
-from lmfdb.search_parsing import BRACKETING_RE, QQ_RE, _multiset_encode, search_parser
+from lmfdb.utils.search_parsing import BRACKETING_RE, QQ_RE, _multiset_encode, search_parser
 PAREN_RE = re.compile(r'(\([^\)]*\))') # won't work for iterated parentheses ((a,b),(c,d))
 
 @search_parser

lmfdb/abvar/fq/stats.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from lmfdb.db_backend import db
-from lmfdb.utils import comma, make_logger
+from lmfdb import db
+from lmfdb.utils import comma
+from lmfdb.logger import make_logger
 from sage.structure.unique_representation import UniqueRepresentation
 from sage.misc.lazy_attribute import lazy_attribute
 

lmfdb/abvar/fq/test_av.py

@@ -1,4 +1,5 @@
-from lmfdb.base import LmfdbTest
+
+from lmfdb.tests import LmfdbTest
 
 class AVTest(LmfdbTest):
 
@@ -13,7 +14,7 @@ def test_polynomial(self):
         r"""
         Check that the formatted polynomial displays correctly
         """
-        self.check_args("/Variety/Abelian/Fq/2/9/aj_bl",'1-9x+37x^{2}-81x^{3}+81x^{4}')
+        self.check_args("/Variety/Abelian/Fq/2/9/aj_bl",'1 - 9 x + 37 x^{2} - 81 x^{3} + 81 x^{4}')
 
     def test_display_field(self):
         r"""
@@ -92,7 +93,7 @@ def test_newton_polygon_plot(self):
         page = self.tc.get("/Variety/Abelian/Fq/2/4/ad_g").data
         # The following is part of the base64 encoded image of the Newton
         # polygon for this isogeny class.
-        assert "4S8eKLeWaDFgkQAKBLwgPyECAAQFeEB%2BQlQACALggPKIMA" in page
+        assert r"data:image/png;base64,iVBORw0KGgo" in page
 
     def test_circle_plot(self):
         r"""
@@ -101,7 +102,7 @@ def test_circle_plot(self):
         page = self.tc.get("/Variety/Abelian/Fq/2/4/ad_g").data
         # The following is part of the base64 encoded image of the circle plot
         # for this isogeny class.
-        assert "gMA4O7CwsJ06NAhDqLDaVBAYEkcQAcA4EccRIezo" in page
+        assert r"data:image/png;base64,iVBORw0KGgo" in page
 
     def test_property_box(self):
         r"""