Diane Trout [Thu, 29 Jan 2015 19:43:18 +0000 (11:43 -0800)]
convert to print_function, and start adding unicode_literals future as well
Diane Trout [Thu, 29 Jan 2015 19:39:52 +0000 (11:39 -0800)]
put #!/usr/bin/env python in the right place
Diane Trout [Thu, 29 Jan 2015 19:00:47 +0000 (11:00 -0800)]
remove ,'s from more except blocks, and now a raise too
Diane Trout [Thu, 29 Jan 2015 18:59:48 +0000 (10:59 -0800)]
more use six.moves to import StringIO
Diane Trout [Thu, 29 Jan 2015 18:44:00 +0000 (10:44 -0800)]
use six.moves to get to python3-style urllib
Diane Trout [Thu, 29 Jan 2015 18:42:52 +0000 (10:42 -0800)]
whitespace-cleanup
Diane Trout [Thu, 29 Jan 2015 18:27:17 +0000 (10:27 -0800)]
remove some commented out code
Diane Trout [Thu, 29 Jan 2015 18:26:27 +0000 (10:26 -0800)]
convert to print_function
Diane Trout [Thu, 29 Jan 2015 18:21:04 +0000 (10:21 -0800)]
use force_text instead of force_unicode for python2/3 compatibility
Diane Trout [Thu, 29 Jan 2015 18:20:11 +0000 (10:20 -0800)]
import StringIO from six.moves
Diane Trout [Thu, 29 Jan 2015 00:08:21 +0000 (16:08 -0800)]
use six to work around rename of configparser
Diane Trout [Thu, 29 Jan 2015 00:00:53 +0000 (16:00 -0800)]
Convert old style except blocks to except Exception as variable: blocks
Diane Trout [Wed, 28 Jan 2015 23:32:02 +0000 (15:32 -0800)]
make the search tool more flexible
Diane Trout [Mon, 26 Jan 2015 20:12:21 +0000 (12:12 -0800)]
remove unused code
Diane Trout [Wed, 21 Jan 2015 01:17:04 +0000 (17:17 -0800)]
Update test_retrieve_config to work with factories
Along the way I slightly altered how the species factory
worked which required tweaking test_samples.
For some reason test_sequencer changed slightly.
Diane Trout [Wed, 14 Jan 2015 19:56:01 +0000 (11:56 -0800)]
fix spelling error in module name
Diane Trout [Tue, 13 Jan 2015 19:45:23 +0000 (11:45 -0800)]
Don't pass null authentication information to ENCODED.
the recent build seems unhappy getting auth=(None, None)
and while I was in there, update the domain name.
Diane Trout [Tue, 13 Jan 2015 19:45:01 +0000 (11:45 -0800)]
use absolute_import and print_function
Diane Trout [Tue, 13 Jan 2015 00:12:38 +0000 (16:12 -0800)]
Update inventory tests to use factory boy.
also start prefering reverse instead of hardcoding urls.
Diane Trout [Mon, 12 Jan 2015 18:50:28 +0000 (10:50 -0800)]
move the file type test cases out into their own module
Diane Trout [Mon, 12 Jan 2015 18:49:51 +0000 (10:49 -0800)]
use migrations for experiments, and use migrations to the file type regexes
Diane Trout [Sat, 10 Jan 2015 00:40:40 +0000 (16:40 -0800)]
get_schema_url only works on object types now, so change some code to meet the new api
Diane Trout [Sat, 10 Jan 2015 00:39:11 +0000 (16:39 -0800)]
at some point I added code that used base64, hashlib, and os, but I never imported them
Diane Trout [Sat, 10 Jan 2015 00:35:57 +0000 (16:35 -0800)]
Forgot to disable loading ClusterStation and Sequencer test cases since I moved them out.
Diane Trout [Sat, 10 Jan 2015 00:28:26 +0000 (16:28 -0800)]
Convert experiments modules to use factories instead of fixtures.
And then propogate those changes throughout the test cases
Diane Trout [Sat, 10 Jan 2015 00:16:54 +0000 (16:16 -0800)]
Improve samples_factory generated objects.
* Add LibraryType and MultiplexIndex factories.
* Use factoryboy's fuzzy tools to generate more interesting objects,
especially to avoid problems with Unique=True fields.
* Use django_get_or_create to make it easier to deail with things
like usernames
* Define field values for is_staff and is_superuser for the user model
* Unsurprisingly this required updating some test cases to
be compatible with the changes.
Diane Trout [Sat, 10 Jan 2015 00:15:03 +0000 (16:15 -0800)]
unimportant whitespace changes, at least the lines with text look the same
Diane Trout [Sat, 10 Jan 2015 00:08:25 +0000 (16:08 -0800)]
whitespace changes
Diane Trout [Sat, 10 Jan 2015 00:07:41 +0000 (16:07 -0800)]
fix typo -- or at least make it consistent. antigen -> antigene
Diane Trout [Sat, 10 Jan 2015 00:04:36 +0000 (16:04 -0800)]
move cluster station and sequencer tests out into their own modules
Diane Trout [Sat, 10 Jan 2015 00:00:34 +0000 (16:00 -0800)]
Use logger instead of trying to print to stdout. especially since print_function has a different syntax for doing that
Diane Trout [Fri, 9 Jan 2015 23:59:15 +0000 (15:59 -0800)]
one should only return json objects. so put our arrays inside a minimal object
Diane Trout [Sat, 13 Dec 2014 00:36:36 +0000 (16:36 -0800)]
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
Conflicts:
htsworkflow/submission/encoded.py
Prefer the multi line
if 'string' in object:
del object['string']
Diane Trout [Sat, 13 Dec 2014 00:34:50 +0000 (16:34 -0800)]
Add document registration class.
Diane Trout [Sat, 13 Dec 2014 00:34:30 +0000 (16:34 -0800)]
add more type checking for parsing object type from an object
Diane Trout [Sat, 13 Dec 2014 00:33:22 +0000 (16:33 -0800)]
add some helpful log messages
Diane Trout [Mon, 1 Dec 2014 19:20:49 +0000 (11:20 -0800)]
add ability to adjust some log level messages
Diane Trout [Mon, 1 Dec 2014 18:57:35 +0000 (10:57 -0800)]
commit script to copy jumpgate sqlite database to felcat postgres
Diane Trout [Mon, 1 Dec 2014 18:56:49 +0000 (10:56 -0800)]
require django 1.7 and factory boy for newer test code
Diane Trout [Fri, 7 Nov 2014 23:24:19 +0000 (15:24 -0800)]
Add some code to help read metadata out of spreadsheets.
also make the schema validator in encoded a bit more forgiving.
Diane Trout [Mon, 3 Nov 2014 22:02:11 +0000 (14:02 -0800)]
forgot to change one test to use factory
Diane Trout [Sat, 1 Nov 2014 00:12:45 +0000 (17:12 -0700)]
The makemigrations code didn't like how I was setting default selections with class methods.
this breaks them out into seperate functions, hopefully less confusing
for the migration code.
Diane Trout [Sat, 1 Nov 2014 00:12:34 +0000 (17:12 -0700)]
name get_query_set was deprecated in favor of get_queryset
Diane Trout [Sat, 1 Nov 2014 00:09:15 +0000 (17:09 -0700)]
Convert samples app to use migrations.
A big problem is that 1.7 migrations cause problems
for the initial data fixture. For whatever reason the
fixture would run before the migration, unsurprisingly
causing trouble.
My choice was either to convert the fixture to a data
migration, or to find another way to generate test data.
Several sources recommended avoiding fixtures for test code
and suggested using something like "factory_boy" to use the
orm to create fake data. So I went ahead and tried an
implementation using that.
Diane Trout [Wed, 29 Oct 2014 17:34:19 +0000 (10:34 -0700)]
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
Diane Trout [Wed, 29 Oct 2014 04:40:55 +0000 (21:40 -0700)]
actually don't track the sqlite3 database
Diane Trout [Mon, 27 Oct 2014 17:58:50 +0000 (10:58 -0700)]
comment out benderjab dependency, as were not using it now
Diane Trout [Mon, 27 Oct 2014 17:57:12 +0000 (10:57 -0700)]
Change the settings default to work with the two scoops split settings.
Also configure logging to work with django 1.7
Diane Trout [Thu, 23 Oct 2014 22:48:03 +0000 (15:48 -0700)]
import os, so we can use os.path.join
Diane Trout [Wed, 24 Sep 2014 03:48:53 +0000 (20:48 -0700)]
relax requirements to make it easier to install on debian
Diane Trout [Fri, 12 Sep 2014 18:44:34 +0000 (11:44 -0700)]
make it easier to override variables in ENCODED class
Diane Trout [Mon, 28 Jul 2014 17:45:27 +0000 (10:45 -0700)]
add frozen package list
Diane Trout [Sat, 26 Jul 2014 18:50:59 +0000 (11:50 -0700)]
configure a mock keyring
Diane Trout [Fri, 25 Jul 2014 22:26:22 +0000 (15:26 -0700)]
make whitespace pep8 complient
Diane Trout [Fri, 25 Jul 2014 22:14:08 +0000 (15:14 -0700)]
Use two-scoop style multiple settings file.
This also adds a config_helper to help create an ini-file
that contains the randomly generated secret key.
Diane Trout [Thu, 24 Jul 2014 21:52:28 +0000 (14:52 -0700)]
DCC example code sets both content-type and accept for sending API access
Diane Trout [Thu, 24 Jul 2014 21:51:04 +0000 (14:51 -0700)]
pep8 whitespace cleanup.
For a few modules this was pretty significant as they
inconsistently used both 2 and 4 space indenting.
Diane Trout [Thu, 24 Jul 2014 21:03:07 +0000 (14:03 -0700)]
create exception using modern python syntax
Diane Trout [Thu, 24 Jul 2014 20:59:05 +0000 (13:59 -0700)]
remove a commented out import
Diane Trout [Thu, 24 Jul 2014 20:56:08 +0000 (13:56 -0700)]
Flatten project hierarchy, moving djano applications out of htsworkflow.frontend into project root.
Unsuprisingly this also required updates to large chunks of
code to change the import paths for things.
I was motivated by the idea of trying to make my django applications more
portable. I tried some hacks with the python path to make it so they
could live in htsworkflow.appname, but django 1.7 seemed to want the app
to have only one import path, and this was the easiest way I could see to
solve that.
Diane Trout [Mon, 23 Jun 2014 23:23:39 +0000 (16:23 -0700)]
whitespace cleanup
Diane Trout [Mon, 23 Jun 2014 22:50:22 +0000 (15:50 -0700)]
clean up for pep8 compliance.
Diane Trout [Mon, 23 Jun 2014 21:06:20 +0000 (14:06 -0700)]
code cleanup, remove commented out code and adjust whitespacing
Diane Trout [Mon, 23 Jun 2014 20:59:37 +0000 (13:59 -0700)]
Attempt to split common initial data from wold lab specific database contents.
Diane Trout [Mon, 23 Jun 2014 18:58:08 +0000 (11:58 -0700)]
Remove very old misplaced initial data fixtures
Diane Trout [Wed, 7 May 2014 00:15:15 +0000 (17:15 -0700)]
Add fields list to a few ModelForms Meta class.
Django 1.7 threw a warning that they were going to require that by 1.8
Diane Trout [Wed, 7 May 2014 00:12:26 +0000 (17:12 -0700)]
Rename get_query_set to get_queryset
It was deprecated in django 1.6, will be removed in 1.8
Diane Trout [Wed, 7 May 2014 00:00:14 +0000 (17:00 -0700)]
Rename HttpResponse parameter mimetype to content_type
The old name was deprecated in django 1.5 and dropped in django 1.7
Diane Trout [Tue, 6 May 2014 23:46:44 +0000 (16:46 -0700)]
remove file created by typoing file name
Diane Trout [Tue, 6 May 2014 23:45:47 +0000 (16:45 -0700)]
Change unittest2 back into unittest.
Django 1.7 docs pointed out unittest2 was backported into
python 2.7, so they dropped their version.
Diane Trout [Tue, 21 Jan 2014 23:55:45 +0000 (15:55 -0800)]
Explicitly list initial_data.json for the test data loader fixtures
South wasn't automatically loading initial_data.json, adding
them to the test case data loading fixture seems to have worked.
Diane Trout [Tue, 10 Jun 2014 20:13:46 +0000 (13:13 -0700)]
Add post_json as some DCC objects are created with post requests.
considering the code is duplicated, there's probably a way to abstract
those functions.
Diane Trout [Tue, 10 Jun 2014 20:09:39 +0000 (13:09 -0700)]
Rename headers to json_headers for requests (seemed a bit clearer)
Also output a more informative http exception
Diane Trout [Tue, 10 Jun 2014 20:05:41 +0000 (13:05 -0700)]
Updates to jsonld context for the DCC schemas.
Also I added a comment for what their prefix NTR means.
Diane Trout [Tue, 10 Jun 2014 22:10:50 +0000 (15:10 -0700)]
Update test_encoded test cases due to https now being the default.
Diane Trout [Tue, 10 Jun 2014 20:04:54 +0000 (13:04 -0700)]
DCC switched to https
Diane Trout [Tue, 10 Jun 2014 22:11:25 +0000 (15:11 -0700)]
Update fastqname code & test code to better support having optional compression extension.
Its a bit weird as thats the first property which is optional, so
it needed some special case logic.
Also I accept either None or '' for the case of no compression extension as
condorfastq passes in compression_extension=''
Diane Trout [Mon, 12 May 2014 23:16:00 +0000 (16:16 -0700)]
Directly generate compressed fastq files from HiSeq split fastqs.
desplit_fastq is the only fastq builder that has the necessary
compression argument.
Diane Trout [Mon, 12 May 2014 23:14:18 +0000 (16:14 -0700)]
the filename templates were moved from condorfastq to fastqname a while ago
Diane Trout [Mon, 12 May 2014 23:12:08 +0000 (16:12 -0700)]
Indicate when desplit_fastq didn't get any files to process
Diane Trout [Tue, 6 May 2014 22:38:48 +0000 (15:38 -0700)]
Make sure we can load a run file that lacks alignment details.
Diane Trout [Thu, 13 Feb 2014 01:28:28 +0000 (17:28 -0800)]
For some reason the previous integrety fixes, added made the failed flowcell be in the second position in the table
Diane Trout [Thu, 13 Feb 2014 01:27:30 +0000 (17:27 -0800)]
Postgresql has referential integrety checking.
So some of my dangling foreign keys caused tests to failed.
I resolved them through a few different ways,
* adding initial_data to include description tables
* adding some additional data to the test fixture.
* renumbering affiliation keys to match my small test list.
I had to reorder the app list because I think there was a dependency
in the wrong order.
Diane Trout [Tue, 6 May 2014 22:32:45 +0000 (15:32 -0700)]
Ignore the path when comparing filenames from the md5 files.
There were too many other ways of creating them or running
the md5 file creation from too many different places for including
the relative path to be reliable.
Diane Trout [Wed, 2 Apr 2014 01:48:40 +0000 (18:48 -0700)]
use autoopen to access fastq files
Diane Trout [Tue, 1 Apr 2014 21:44:46 +0000 (14:44 -0700)]
Start implementing tool to compute library fastq quality
Diane Trout [Thu, 13 Feb 2014 01:28:50 +0000 (17:28 -0800)]
Just use the python 2 url parsers instead of trying to pull it out of requests
Diane Trout [Thu, 13 Feb 2014 01:21:01 +0000 (17:21 -0800)]
Update timestamps in inventory app test data to be timezone aware.
Diane Trout [Wed, 12 Feb 2014 21:57:39 +0000 (13:57 -0800)]
point default flowcell directory to test data
Diane Trout [Wed, 12 Feb 2014 21:57:22 +0000 (13:57 -0800)]
add default values for some application specific values
Diane Trout [Thu, 23 Jan 2014 20:13:51 +0000 (12:13 -0800)]
Configure default STATICFILES_DIRS for static files (css, js, imgs)
And since we're using the newer django static file handling, we
can remove the old debug url configration to find the static files.
Diane Trout [Wed, 22 Jan 2014 23:53:41 +0000 (15:53 -0800)]
Mathematica had a suggestion for a fastq mime type. I extended for my other sequence types
Diane Trout [Wed, 22 Jan 2014 23:52:53 +0000 (15:52 -0800)]
Regex pattern was wrong.
Diane Trout [Tue, 21 Jan 2014 23:54:27 +0000 (15:54 -0800)]
Convert more timestamps to include timezone
Diane Trout [Tue, 10 Jun 2014 22:48:46 +0000 (15:48 -0700)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Tue, 18 Feb 2014 23:34:14 +0000 (15:34 -0800)]
Add option to compress fastq file
Diane Trout [Wed, 12 Feb 2014 22:40:36 +0000 (14:40 -0800)]
Allow arbitrarily long regexes in experiment.FileType table
Diane Trout [Wed, 22 Jan 2014 22:14:26 +0000 (14:14 -0800)]
Merge branch 'master' of mus.cacr.caltech.edu:htsworkflow
Diane Trout [Wed, 22 Jan 2014 22:10:49 +0000 (14:10 -0800)]
pass filters a string not an undefined variable
Diane Trout [Fri, 17 Jan 2014 23:04:22 +0000 (15:04 -0800)]
Remove django test environment setup code.
I've found djangos ./manage.py test to work quite well these days,
and attempting to manually setup the django test environment generates
an exception on shutdown.