Skip to content

Commit f5eb61d

Browse files
committed
Merge remote-tracking branch 'upstream/main' into wt/ai/t05-lfunc-euler-trace-download
2 parents 20e0eae + cf03052 commit f5eb61d

125 files changed

Lines changed: 4268 additions & 1196 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/generate-matrix.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"lmfdb/tests/test_dynamic_knowls.py lmfdb/tests/test_root.py lmfdb/hecke_algebras/test_hecke_algebras.py lmfdb/tests/test_homepage.py lmfdb/elliptic_curves/test_ell_curves.py lmfdb/elliptic_curves/test_browse_page.py",
66
"lmfdb/sato_tate_groups/test_st.py lmfdb/hilbert_modular_forms/test_hmf.py lmfdb/tests/test_spelling.py lmfdb/tests/test_template_namespace.py lmfdb/tests/test_acknowlegments.py lmfdb/tests/test_tensor_products.py",
77
"lmfdb/cluster_pictures/test_clusterpicture.py lmfdb/local_fields/test_localfields.py lmfdb/ecnf/test_ecnf.py lmfdb/ecnf/test_isog_class.py lmfdb/api/test_api.py lmfdb/characters/test_characters.py",
8-
"lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py",
8+
"lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py lmfdb/tests/test_connection_reset.py",
99
"lmfdb/artin_representations/test_artin_representation.py lmfdb/genus2_curves/test_genus2_curves.py",
1010
"lmfdb/classical_modular_forms/test_cmf.py lmfdb/classical_modular_forms/test_cmf2.py",
1111
"lmfdb/lfunctions/test_lfunctions.py",

.github/workflows/matrix_includes.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@
6060
"server": "devmirror"
6161
},
6262
{
63-
"files": "lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py",
63+
"files": "lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py lmfdb/tests/test_connection_reset.py",
6464
"folders": "belyi higher_genus_w_automorphisms hypergm lattice maass_forms tests users",
6565
"server": "proddb"
6666
},
6767
{
68-
"files": "lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py",
68+
"files": "lmfdb/users/test_users.py lmfdb/lattice/test_lattice.py lmfdb/maass_forms/test_maass.py lmfdb/higher_genus_w_automorphisms/test_hgcwa.py lmfdb/belyi/test_belyi.py lmfdb/hypergm/test_hgm.py lmfdb/tests/test_utils.py lmfdb/tests/test_connection_reset.py",
6969
"folders": "belyi higher_genus_w_automorphisms hypergm lattice maass_forms tests users",
7070
"server": "devmirror"
7171
},

.github/workflows/python-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
- name: checking that we didn't miss any test files
9191
shell: bash -l {0}
9292
# If this fails you need to update the file list above and file count
93-
run: test $(find lmfdb -name 'test_*.py' -or -name '*_test.py' | wc -l) -eq 43
93+
run: test $(find lmfdb -name 'test_*.py' -or -name '*_test.py' | wc -l) -eq 44
9494

9595
- name: Config LMFDB to run tests against proddb
9696
if: matrix.files != 'lint' && matrix.server == 'proddb'

Development.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mathematician, or the wikipedia article of someone famous.
6060

6161
An object's home page should provide a wide variety of information about the
6262
object. Basic information, of interest to both experts and non-experts,
63-
should appear ear the top. More specialized information should appear
63+
should appear near the top. More specialized information should appear
6464
near the bottom.
6565

6666
In the upper right corner of each home page should be the "properties" box,
@@ -209,7 +209,7 @@ Here are some conventions the LMFDB uses:
209209

210210
1. If X is the URL of an object, then L/X is the URL of its standard
211211
L-function. According to the Langlands program, other L-functions
212-
associated to X may be written on the the form L(s, X, rho). Examples include
212+
associated to X may be written in the form L(s, X, rho). Examples include
213213

214214
- L(s, f, sym^2)
215215
- L(s, f, spin)
@@ -246,7 +246,7 @@ Here are some conventions the LMFDB uses:
246246
Qsqrt5 as a search parameter for the coefficient field.
247247

248248
Note that number fields like Qsqrt5 has an "official name" as well as a
249-
nickname. Many discussions have occurred for what appropriate labels for
249+
nickname. Many discussions have occurred about what appropriate labels for
250250
objects should be. Examine the structure of existing objects in the
251251
LMFDB very closely to maintain correct labels and relationships.
252252

@@ -269,9 +269,9 @@ Here are some conventions the LMFDB uses:
269269
- `/Motive/Hypergeometric/Q/\<label>`
270270
- `/NumberField/\<label>`
271271

272-
In practice, prior to deciding on a labelling scheme for new objects, one
272+
In practice, prior to deciding on a labeling scheme for new objects, one
273273
should talk to the current LMFDB developers (who now have a lot of experience
274-
in considering labelling schemes).
274+
in considering labeling schemes).
275275

276276

277277
Templates
@@ -347,7 +347,7 @@ Testing
347347
```
348348
It takes a few minutes. If sage or some additional parts are missing it may fail,
349349
consider updating
350-
(see [Getting Started](https://github.com/LMFDB/lmfdb/wiki/GettingStarted) )
350+
(see [Getting Started](https://github.com/LMFDB/lmfdb/wiki/GettingStarted))
351351

352352
- New blueprints and features should include a `test_<name>.py` file
353353
which runs tests on all functions.
@@ -382,7 +382,7 @@ field:
382382
383383
### Snippet testing
384384
385-
Sometimes computer algebra systems make breaking changes which render the code snippets invalid. To catch this, there's a testing system for snippets implemented in `lmfdb/tests/generate_snippet_tests.py`. This runs the code line by line in the various CAS-es, excluding magma. It does not test correctness of the results, only consistency, by comparing with previous results stored in the `lmfdb/tests/snippet_tests` directory. Normally (and at the time of writing), this is run automatically by Github Actions, which generates the relevant log files. However, it is possible to run it manually using the CLI tool
385+
Sometimes computer algebra systems make breaking changes which render the code snippets invalid. To catch this, there's a testing system for snippets implemented in `lmfdb/tests/generate_snippet_tests.py`. This runs the code line by line in the various CAS-es. It does not test correctness of the results, only consistency, by comparing with previous results stored in the `lmfdb/tests/snippet_tests` directory. Normally (and at the time of writing), this is run automatically by Github Actions, which generates the relevant log files. However, it is possible to run it manually using the CLI tool
386386

387387
```bash
388388
sage --python ./lmfdb/tests/generate_snippet_tests.py -h
@@ -430,15 +430,15 @@ this puts you inside an interactive python debugger, where you can:
430430
- continue executing code using the `n` command.
431431
432432
If you get lost, the command `bt` shows you exactly where you
433-
are, and `up` helps you to get on step up on the stack.
433+
are, and `up` helps you to get one step up on the stack.
434434
Of course, `help <command>` will tell you more.
435435
436436
Git Tips
437437
=========
438438
439439
Contributing to the LMFDB requires some familiarity with git, a popular version control system which LMFDB uses. The LMFDB code base is hosted on Github, which is a common hosting service owned by Microsoft.
440440
- [Official git tutorial](https://git-scm.com/docs/gittutorial) and [Github's git guide](https://github.com/git-guides)
441-
- Use a global .gitignore file to exclude temporary files like `.DS_store` or `main.py~`; [copy-paste ready instructions on github](https://help.github.com/articles/ignoring-files#global-gitignore).
441+
- Use a global .gitignore file to exclude temporary files like `.DS_Store` or `main.py~`; [copy-paste ready instructions on github](https://help.github.com/articles/ignoring-files#global-gitignore).
442442
- Configure your global .gitconfig for shortcuts or global configuration options; for example:
443443
```
444444
[alias]

GettingStarted.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Installation
4646
* Install dependencies. This requires you to have write access to the
4747
Sage installation directory, so should be no problem on a personal
4848
machine, but if you are using a system-wide Sage install on a shared
49-
machine, you will need ask a system administrator to do this step.
49+
machine, you will need to ask a system administrator to do this step.
5050

5151
```
5252
sage -i gap_packages
@@ -76,13 +76,13 @@ Installation
7676
that). This problem does seem to be resolved for Sage 9.3beta, and it is currently
7777
unclear if the problem exists for Sage 9.0 or 9.1.
7878
79-
- In case the last step fails by is Mac OSX with the error
79+
- In case the last step fails on Mac OSX with the error
8080
8181
```
8282
Error: pg_config executable not found.
8383
```
8484
85-
we recommend to installing PostgreSQL by doing
85+
we recommend installing PostgreSQL by doing
8686
8787
```
8888
brew install postgresql
@@ -104,9 +104,9 @@ Installation
104104
- [optional] Memcache. *This step is not at all necessary and can
105105
safely be ignored!* Memcache speeds up recompilation of python
106106
modules during development. Using it requires both installing the
107-
appropriate package for your Operating System and installing an
107+
appropriate package for your operating system and installing an
108108
additional python module. The first line below needs to be run in
109-
a Sage shell, and the for second you need to be a super-user to
109+
a Sage shell, and for the second you need to be a super-user to
110110
install memcached if your machine does not have it.
111111
112112
* `easy_install -U python-memcached`
@@ -141,7 +141,7 @@ Running
141141
* When running with `--debug`, whenever a python (*.py) file changes
142142
the server will reload automatically. If you save while editing
143143
at a point where such a file is not syntactically correct, the
144-
server will crash and you will need to `start_lmfdb` again. Any
144+
server will crash and you will need to `start-lmfdb` again. Any
145145
changes to html files will not cause the server to restart, so
146146
you will need to reload the pages in your browser. Changes in
147147
the yaml files which are read only once at startup will require
@@ -167,8 +167,8 @@ Running
167167
CoCalc
168168
======
169169
170-
* You can run the LMFDB inside a [CoCalc](https://www.cocalc.com) project by doing
171-
following the above installation instructions on a terminal in your project (you may want to
170+
* You can run the LMFDB inside a [CoCalc](https://www.cocalc.com) project by following
171+
the above installation instructions on a terminal in your project (you may want to
172172
install the requirements using the `--user` flag).
173173
Explicitly,
174174
@@ -194,7 +194,7 @@ Troubleshooting
194194
===============
195195
196196
[warning] Recently on some linux machines, users have had to install the
197-
contents of requirements.txt by manually. If the above instructions do not
197+
contents of requirements.txt manually. If the above instructions do not
198198
work, un-install the above packages and re-install them one at a time,
199199
including those in requirements.txt.
200200
@@ -259,10 +259,10 @@ Code development and sharing your work
259259
branches upstream to be aware of: `web`, `dev` and `main`:
260260
261261
- `web` is changed rarely and contains the code currently running at
262-
[www.lmfdb.org](www.lmfdb.org)
262+
[www.lmfdb.org](https://www.lmfdb.org)
263263
264264
- `dev` is changed more often and contains the code currently running at
265-
[beta.lmfdb.org](beta.lmfdb.org)
265+
[beta.lmfdb.org](https://beta.lmfdb.org)
266266
267267
- `main` is the development branch.
268268
@@ -323,5 +323,5 @@ For anyone who would like to attempt it, the following steps should theoreticall
323323
* Now you need to run ssh-keygen within the Sage appliance and e-mail the result to Harald Schilly, Jonathan Bober or John Cremona (see above).
324324
Since copy-and-paste can be tricky from inside the virtual image, we suggest writing to a file shared by the host OS.
325325
326-
* The instructions for Linux/OS X should now work. You should be able to forward the mongo database and run `sage -python start-lmfdb.py` within the Sage appliance,
326+
* The instructions for Linux/OS X should now work. You should be able to run `sage -python start-lmfdb.py` within the Sage appliance,
327327
and access the resulting website from your host OS' web browser.

0 commit comments

Comments
 (0)