Age | Commit message (Collapse) | Author |
|
the JSON-formatted string pulled from Redis (since this was needed after the Python 3 switchover)
* wqflask/utility/redis_tools.py - Created function load_json_from_redis that encodes the key (column_value) when fetching a value from the JSON pulled from Redis
|
|
* wqflask/utility/hmac.py (hmac_creation): Use latin-1 when
serializing the hmac secret. This ensures that the behaviour
of *verify_cookie* remains the same as in the python2 tip.
|
|
|
|
|
|
Same as:
https://github.com/genenetwork/genenetwork2/pull/422/commits/46443ec8d2cdfd7c60358a889d90a90e4f7daaf4
|
|
* wqflask/base/trait.py: Apply pep8.
* wqflask/utility/authentication_tools.py: Ditto.
|
|
|
|
* wqflask/utility/hmac.py: Apply pep8 and fix typo.
|
|
* wqflask/utility/authentication_tools.py: Apply pep8 formatting to
file.
|
|
* wqflask/utility/authentication_tools.py
(check_resource_availability): Combine if statements into one boolean
check in one if branch.
|
|
* wqflask/utility/authentication_tools.py: Remove accidental char at beginning
of line.
|
|
work
* wqflask/utility/redis_tools.py - There was an issue where resources
wouldn't be updated if they already existed. This is because the code
didn't yet account for the "update" tag (that is meant to give the
option of preventing updating resources when running the script to enter
all resources into Redis). I changed the logic to add a resource if
"update" is True or the resource doesn't already exist (so it won't if
update is False and the resource exists).
|
|
|
|
group didn't have an InbredSetCode set in the DB
* wqflask/utility/authentication_tools.py - Changed get_group_code to
return an empty string instead of None if InbredSetCode doesn't exist
for a dataset group
* wqflask/wqflask/views.py - Changed zipped export filename to
"export_(datetime)" instead of "collection_(datetime)" since this export
can occur from both the collection page and the global search page
|
|
* wqflask/utility/authentication_tools.py(add_new_resource): If group_code is
"None", an error is thrown when you try to: `group_code + "_" + str(trait_id)`
|
|
See: <https://stackoverflow.com/questions/31848293/python3-and-hmac-how-to-handle-string-not-being-binary>
|
|
* wqflask/utility/db_tools.py: escape_string returns a binary string which
introduces a bug when composing sql query string. The escaped strings have to be
converted to plain text.
|
|
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-future>
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-basestring>
|
|
* wqflask/utility/Plot.py: import corestats from the utility module.
|
|
|
|
* wqflask/utility/Plot.py: Remove unused imports like "numarray". "numarray" is
does not have py3 support so it's important to remove references to it.
|
|
user apparently doesn't have access to, so I replaced it with a link to
the dynamically set TEMPDIR
* wqflask/utility/pillow_utils.py - Replaced "/tmp/" in image location
with TEMPDIR
|
|
* wqflask/utility/webqtlUtil.py (genRandStr): Replace "string.letters" with
"string.ascii_letters".
|
|
Run:
```
2to3-3.8 -f imports -w . && \
2to3-3.8 -f imports2 -w .
```
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-imports> and
<https://docs.python.org/2/library/2to3.html#2to3fixer-imports2>
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-urllib>
|
|
Run `2to3-3.8 -f idioms -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-idioms>
|
|
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-xrange>
|
|
Run `2to3-3.8 -f raise -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-raise>
|
|
Run `2to3-3.8 -f ne -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-ne>
|
|
Run `2to3-3.8 -f dict -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-dict> and
<https://stackoverflow.com/questions/17695456/why-does-python-3-need-dict-items-to-be-wrapped-with-list>
|
|
* wqflask/utility/svg.py [roct, ellipse, SVGelement]: Raise only a single value error
if either height or width is not defined. Fixes parsing error when running
`2to3-3.8 -f apply -w .`
|
|
Run `2to3-3.8 -f map -w .`
See: <https://docs.python.org/2/library/2to3.html#2to3fixer-map>
|
|
* wqflask/utility/svg.py: Apply pep8 to fix indentation error when running
`2to3-3.8 -w .`:
````
RefactoringTool: Can't parse ./wqflask/utility/svg.py: IndentationError: unindent does not match any outer indentation level (<tokenize>, line 403)
````
|
|
* wqflask/utility/svg.py: Use "!=". The operator, "<>" is removed in Python3
|
|
|
|
* wqflask/utility/Plot.py: Update docstring.
|
|
* wqflask/utility/pillow_utils.py: New method.
|
|
Use the new draw_rotated_text() function to draw the text rotated as was
formerly done.
* wqflask/utility/Plot.py (plotBar): Use draw_rotated_text().
* wqflask/wqflask/marker_regression/display_mapping_results.py:
(DisplayMappingResults) Use draw_rotated_text().
|
|
* wqflask/utility/pillow_utils.py: Create a module to hold some utility
functions for drawing with Pillow. Initialise the module with a function to draw
rotated text.
|
|
* wqflask/utility/Plot.py: Update font paths.
* wqflask/fonts/ttf: Update font files.
|
|
* wqflask/wqflask/marker_regression/display_mapping_results.py: Add font files
(DisplayMappingResults): Update the code from the Piddle way of things to the
Pillow way of things, for example, replace:
- pid.drawRect(...) with im_drawer.rectangle(...)
- pid.drawString(...) with im_drawer.text(...)
- pid.drawPolygon(...) with im_drawer.polygon(...) etc.
* wqflask/utility/Plot.py: Migrate code from the older, unsupported Piddle to
the newer Pillow library.
|
|
* wqflask/utility/authentication_tools.py: the code forgot to get
resource_info when a resource wasn't in Redis yet, causing an error when
it was referenced, so I added a line getting the resource info (and also
a couple comments for other lines related to authentication)
|
|
|
|
Build/add tests
|
|
This reverts commit d5e87fa6fe7546b46790f512d984a5501223082f.
|
|
* wqflask/utility/tools.py: Unittests will use `from wqflask.wqflask import app`
and the gn2 script will use `from wqflask import app`
|
|
* wqflask/utility/formatting.py: apply it
|
|
* wqflask/utility/formatting.py(numify): Update `num_repr` to have a zero
|