htsworkflow.git
7 years agoTest htsworkflow under several different django & python versions django1.7
Diane Trout [Fri, 10 Mar 2017 00:42:26 +0000 (16:42 -0800)]
Test htsworkflow under several different django & python versions

7 years agowhitespace fixes
Diane Trout [Thu, 9 Mar 2017 23:49:06 +0000 (15:49 -0800)]
whitespace fixes

7 years agoMake times a bit sloppier as my test vm was kind of slow
Diane Trout [Thu, 9 Mar 2017 23:28:56 +0000 (15:28 -0800)]
Make times a bit sloppier as my test vm was kind of slow

7 years agodelete jsonld helpers, as rdflib has its own jsonld plugin
Diane Trout [Thu, 9 Mar 2017 23:28:18 +0000 (15:28 -0800)]
delete jsonld helpers, as rdflib has its own jsonld plugin

7 years agoport ucsc_gather to rdflib
Diane Trout [Thu, 9 Mar 2017 23:27:49 +0000 (15:27 -0800)]
port ucsc_gather to rdflib

7 years agoport encode_find to rdflib
Diane Trout [Thu, 9 Mar 2017 23:27:16 +0000 (15:27 -0800)]
port encode_find to rdflib

7 years agoport condorfastq to rdflib
Diane Trout [Thu, 9 Mar 2017 23:26:28 +0000 (15:26 -0800)]
port condorfastq to rdflib

7 years agoPort daf to rdflib
Diane Trout [Thu, 9 Mar 2017 23:25:43 +0000 (15:25 -0800)]
Port daf to rdflib

7 years agoPort submission.py to rdflib
Diane Trout [Thu, 9 Mar 2017 22:42:56 +0000 (14:42 -0800)]
Port submission.py to rdflib

7 years agoPort test_inventory to rdflib
Diane Trout [Thu, 9 Mar 2017 19:59:59 +0000 (11:59 -0800)]
Port test_inventory to rdflib

7 years agoMake compatbile with rdflib and python 2/3
Diane Trout [Wed, 8 Mar 2017 00:32:36 +0000 (16:32 -0800)]
Make compatbile with rdflib and python 2/3

* remove old get_model redland code.
* add_default_namespaces needs ConjunctiveGraph
* serialize returns bytes in python 3, which needs to be
  converted to a string for later functions

7 years agoBind the right XML namespace variable in our header
Diane Trout [Wed, 8 Mar 2017 00:28:15 +0000 (16:28 -0800)]
Bind the right XML namespace variable in our header

7 years agoPort pipelines.sequences to rdflib
Diane Trout [Tue, 28 Feb 2017 19:11:48 +0000 (11:11 -0800)]
Port pipelines.sequences to rdflib

7 years agoPort test_samples to rdflib
Diane Trout [Tue, 28 Feb 2017 01:17:32 +0000 (17:17 -0800)]
Port test_samples to rdflib

7 years agoPort test_experiment to rdflib
Diane Trout [Tue, 28 Feb 2017 01:14:15 +0000 (17:14 -0800)]
Port test_experiment to rdflib

I used RDF for some test cases

7 years agoPort rdfinfer to rdflib (fixing a hidden bug)
Diane Trout [Mon, 27 Feb 2017 23:22:39 +0000 (15:22 -0800)]
Port rdfinfer to rdflib (fixing a hidden bug)

The redland property validation was wrong and was missing validation
errors.

Also I reused a function name.

This could still have better error messages

7 years agoPort rdfhelp to rdflib from redland librdf.
Diane Trout [Fri, 24 Feb 2017 22:43:30 +0000 (14:43 -0800)]
Port rdfhelp to rdflib from redland librdf.

Several things that were hard in librdf are much easier
in rdflib, so I dropped several wrapper functions since the
rdflib API was reasonable to use directly.

7 years agoour pages are xhtml, so customize replace the django admin search form
Diane Trout [Tue, 28 Feb 2017 01:08:06 +0000 (17:08 -0800)]
our pages are xhtml, so customize replace the django admin search form

7 years agoForce a reasonable sort order for sample sheet
Diane Trout [Thu, 23 Feb 2017 01:03:12 +0000 (17:03 -0800)]
Force a reasonable sort order for sample sheet

since we made the opposite order the default for lanes_for

7 years agoA user object is not the same as a username
Diane Trout [Thu, 23 Feb 2017 01:01:28 +0000 (17:01 -0800)]
A user object is not the same as a username

Sometimes type checking would be good.

7 years agoExpect empty list instead of a 404.
Diane Trout [Wed, 22 Feb 2017 23:53:36 +0000 (15:53 -0800)]
Expect empty list instead of a 404.

I think it makes more sense

7 years agoSet sort order on Lanes model.
Diane Trout [Wed, 22 Feb 2017 23:45:00 +0000 (15:45 -0800)]
Set sort order on Lanes model.

I was enforcing a sort order one one way to retrieve lanes but not the
other, which ment my tests depended on the database default return
order.

This then impacted another test of 'expected' results which needed to
be updated.

7 years agoWhitespace change, wrap line for easier reading
Diane Trout [Wed, 22 Feb 2017 23:05:03 +0000 (15:05 -0800)]
Whitespace change, wrap line for easier reading

7 years agoDCC tightned up their validator
Diane Trout [Sat, 18 Feb 2017 00:48:50 +0000 (16:48 -0800)]
DCC tightned up their validator

Empty list wasn't sufficiently empty.

7 years agoAdd new paths for spreadsheet ENCODE submission.
Diane Trout [Sat, 18 Feb 2017 00:48:03 +0000 (16:48 -0800)]
Add new paths for spreadsheet ENCODE submission.

Added
 * /file/
 * /files/
 * /annotations/

7 years agoUpdate flowcell chage_form override
Diane Trout [Wed, 11 Jan 2017 23:26:20 +0000 (15:26 -0800)]
Update flowcell chage_form override

The old version had hardcode url names which have changed some.
this version uses the named url views to point to started email page,

Additionally I copied and repasted the chunk of object-tools from the
source template.

7 years agoUpdate referring to admin changelink static icons
Diane Trout [Wed, 11 Jan 2017 23:05:03 +0000 (15:05 -0800)]
Update referring to admin changelink static icons

7 years agoRemove obsolete render_options, it's available in the base class
Diane Trout [Wed, 11 Jan 2017 23:03:38 +0000 (15:03 -0800)]
Remove obsolete render_options, it's available in the base class

7 years agodev laptop has a new hostname
Diane Trout [Wed, 11 Jan 2017 23:02:54 +0000 (15:02 -0800)]
dev laptop has a new hostname

7 years agoMerge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
Diane Trout [Wed, 11 Jan 2017 00:58:11 +0000 (16:58 -0800)]
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7

7 years agoSave some example sql queries mirrored copy of encode database
Diane Trout [Wed, 11 Jan 2017 00:56:52 +0000 (16:56 -0800)]
Save some example sql queries mirrored copy of encode database

7 years agoUse local.py if we don't have a host settings file
Diane Trout [Fri, 21 Oct 2016 22:08:15 +0000 (15:08 -0700)]
Use local.py if we don't have a host settings file

7 years agoFix test case looking for library id
Diane Trout [Thu, 15 Sep 2016 00:02:51 +0000 (17:02 -0700)]
Fix test case looking for library id

Looking at the text for the strong node didn't work when the actual html was
<strong><a>text</a></strong>

7 years agoremove unused import
Diane Trout [Thu, 15 Sep 2016 00:02:33 +0000 (17:02 -0700)]
remove unused import

7 years agoReport no data found when collections empty
Diane Trout [Thu, 15 Sep 2016 00:00:31 +0000 (17:00 -0700)]
Report no data found when collections empty

The xhtml validator caught a few cases where empty data generated
some invalid html because some table or list bodies were missing. I
thought it reasonable to include a message that nothing was found
instead of leaving the table blank.

7 years agoAdapt response.content for RDF and xhtml validator
Diane Trout [Wed, 14 Sep 2016 23:59:12 +0000 (16:59 -0700)]
Adapt response.content for RDF and xhtml validator

Irritatingly one wants bytes and one wants unicode under python3.

7 years agoelpy+flake8 suggested some formatting improvements
Diane Trout [Wed, 14 Sep 2016 23:06:05 +0000 (16:06 -0700)]
elpy+flake8 suggested some formatting improvements

7 years agoDelete temp objects to avoid constraint error
Diane Trout [Wed, 14 Sep 2016 23:03:09 +0000 (16:03 -0700)]
Delete temp objects to avoid constraint error

Django 1.10 with Postgres 9.? was throwing an error because the
samples_htsuser id that was assigned to an affiliation didn't exist in
the database.

The simplest solution I found was to delete the objects from the ORM,
I don't think they were ever actually created in the db so I'm not sure
how the constraint check was happening.

7 years agoMove to render and use simple context dictionaries
Diane Trout [Wed, 14 Sep 2016 21:40:33 +0000 (14:40 -0700)]
Move to render and use simple context dictionaries

render_to_response is likely to be deprecated at some point

7 years agoThe DCC has complained about me making a few common typos, so I added some checks...
Diane Trout [Mon, 25 Jul 2016 23:38:31 +0000 (16:38 -0700)]
The DCC has complained about me making a few common typos, so I added some checks for those cases

7 years agosome date cells contain two dates, which is treated as a string
Diane Trout [Mon, 25 Jul 2016 23:38:07 +0000 (16:38 -0700)]
some date cells contain two dates, which is treated as a string

7 years agoRemove references to migrations on topic branches
Diane Trout [Fri, 24 Jun 2016 23:26:05 +0000 (16:26 -0700)]
Remove references to migrations on topic branches

7 years agoTry providing new django apps-style configuration
Diane Trout [Thu, 2 Jun 2016 20:47:39 +0000 (13:47 -0700)]
Try providing new django apps-style configuration

Not sure if I actually needed to do this.

7 years agoThe sort order of lanes changed breaking my test
Diane Trout [Thu, 2 Jun 2016 20:46:47 +0000 (13:46 -0700)]
The sort order of lanes changed breaking my test

7 years agoDefine filters variable again
Diane Trout [Thu, 2 Jun 2016 20:45:38 +0000 (13:45 -0700)]
Define filters variable again

There's a conditional that still used it, however we still need to
actually implement the todo functionality with newer django.

7 years agoSave new object before attaching to a collection
Diane Trout [Thu, 2 Jun 2016 20:44:27 +0000 (13:44 -0700)]
Save new object before attaching to a collection

Django tests were throwing warning about the newfile object not being
saved when I added it to the datafile_set collection.

7 years agoUpdate custom user model for django 1.9ish.
Diane Trout [Thu, 2 Jun 2016 20:43:28 +0000 (13:43 -0700)]
Update custom user model for django 1.9ish.

They implemented some nicer ways of overriding the user model

7 years agoRemove null=True from a few fields
Diane Trout [Thu, 2 Jun 2016 20:21:24 +0000 (13:21 -0700)]
Remove null=True from a few fields

django check pointed out that null=True is confusing with blank or
ManyToMany fields.

7 years agoUpdate multiplex_id max length to 255
Diane Trout [Thu, 2 Jun 2016 20:20:11 +0000 (13:20 -0700)]
Update multiplex_id max length to 255

we had a very heavily mutiplexed library

7 years agoQuery_set was renamed to queryset
Diane Trout [Thu, 2 Jun 2016 00:10:01 +0000 (17:10 -0700)]
Query_set was renamed to queryset

and I forgot to update the access in this template.
Good thing my test case caught it, because there
was no other error.

7 years agoMatch what generate_sample_results_tree creates
Diane Trout [Thu, 2 Jun 2016 00:08:07 +0000 (17:08 -0700)]
Match what generate_sample_results_tree creates

The turtle rules I was using for scanning a submission directory
didn't match what I was creating, which was generating some
warning messages.

Fix this cut down on logger warning messages being generated
during test runs.

7 years agoUse find_statements instead of SPARQL for a query
Diane Trout [Thu, 2 Jun 2016 00:05:52 +0000 (17:05 -0700)]
Use find_statements instead of SPARQL for a query

The SPARQL query ended up with an unbound variable which
generated a warning, I redid the query with just a model.find_statements
which doesn't generate a warning

(My test output was getting cluttered with too many logger warnings)

7 years agoAdmin url includes /change/ at the end
Diane Trout [Thu, 2 Jun 2016 00:04:40 +0000 (17:04 -0700)]
Admin url includes /change/ at the end

so my tests that were looking at
/admin/experiments/flowcel/{flowcell id}/
needed to change to
/admin/experiments/flowcel/{flowcell id}/change/

this of course means we now require django 1.9 for tests.

7 years agoRemove unused variables
Diane Trout [Thu, 2 Jun 2016 00:03:26 +0000 (17:03 -0700)]
Remove unused variables

7 years agogive LaneOptions object access to the admin site
Diane Trout [Wed, 1 Jun 2016 23:58:59 +0000 (16:58 -0700)]
give LaneOptions object access to the  admin site

Somewhere the changelist I was inheriting from needed a method from the
admin site. (empty_value_display)

7 years agowhite-space fix
Diane Trout [Wed, 1 Jun 2016 23:57:43 +0000 (16:57 -0700)]
white-space fix

7 years agoUse render instead of render_to_response
Diane Trout [Wed, 1 Jun 2016 23:56:13 +0000 (16:56 -0700)]
Use render instead of render_to_response

Somtimes I needed to use context_instance=RequestContext(request)
in my templates, and that parameter was depreacted for
render_to_response.

It seemed easier to just universally switch to the newer render() call
which directly takes the request object.

7 years agoUse named url pattern instead of package name
Diane Trout [Wed, 1 Jun 2016 23:53:55 +0000 (16:53 -0700)]
Use named url pattern instead of package name

7 years agoReplace permalink decorator with url reverse
Diane Trout [Wed, 1 Jun 2016 23:52:32 +0000 (16:52 -0700)]
Replace permalink decorator with url reverse

7 years agoUse reverse with named url patterns
Diane Trout [Wed, 1 Jun 2016 23:38:28 +0000 (16:38 -0700)]
Use reverse with named url patterns

instead of with the full package name

7 years agoName all of the view that we need to reverse
Diane Trout [Wed, 1 Jun 2016 23:33:24 +0000 (16:33 -0700)]
Name all of the view that we need to reverse

Django 1.9 wants to remove reversing by package name,
as far as I can tell the simplest way to then reverse a
name to find the view is to name the url pattern.

The next few commits should take advantage of the names.

7 years agoAdd migrations to the small apps.
Diane Trout [Tue, 24 May 2016 22:45:15 +0000 (15:45 -0700)]
Add migrations to the small apps.

Django 1.9 dropped the old way of creating the database so we needed to
update

7 years agoUpdate template configuration for Django 1.9
Diane Trout [Tue, 24 May 2016 22:43:21 +0000 (15:43 -0700)]
Update template configuration for Django 1.9

7 years agoDjango 1.9? replaced request.REQUEST with .GET
Diane Trout [Tue, 24 May 2016 22:37:14 +0000 (15:37 -0700)]
Django 1.9? replaced request.REQUEST with .GET

update our code so we access the new variable name

7 years agoRemove unused imports
Diane Trout [Wed, 1 Jun 2016 23:32:03 +0000 (16:32 -0700)]
Remove unused imports

Remove unused imports

7 years agoCollapse multiple imports from the same module
Diane Trout [Wed, 1 Jun 2016 23:29:46 +0000 (16:29 -0700)]
Collapse multiple imports from the same module

7 years agoReplace import * with explicit list of imports
Diane Trout [Wed, 1 Jun 2016 23:26:52 +0000 (16:26 -0700)]
Replace import * with explicit list of imports

7 years agoSwitch to GenericIPAddressField
Diane Trout [Tue, 12 Apr 2016 22:46:36 +0000 (15:46 -0700)]
Switch to GenericIPAddressField

Django 1.9 added support for ipv6 addresses and changed from
IPAddressField to GenericIPAddressField

7 years agoRefactor out code to submit a single file from a loop.
Diane Trout [Fri, 8 Apr 2016 00:03:31 +0000 (17:03 -0700)]
Refactor out code to submit a single file from a loop.

I had some files to upload that weren't part of a
library result set... and that seemed like the easiest
way to reuse my code.

7 years agoDjango 1.9 deprecated string based url names and django.conf.url.patterns
Diane Trout [Fri, 8 Apr 2016 00:01:46 +0000 (17:01 -0700)]
Django 1.9 deprecated string based url names and django.conf.url.patterns

I think those changes should be backwards, and they usually
shorten the url() lines so seemed reasonable to apply.

7 years agowhitespace change
Diane Trout [Thu, 7 Apr 2016 19:47:31 +0000 (12:47 -0700)]
whitespace change

7 years agoremove unused imports
Diane Trout [Thu, 7 Apr 2016 19:47:20 +0000 (12:47 -0700)]
remove unused imports

7 years agoUnicode munging for python3
Diane Trout [Fri, 24 Jun 2016 22:27:52 +0000 (15:27 -0700)]
Unicode munging for python3

Not sure if I'm breaking python2 though

7 years agoImplement writing to compressed files for qseq2fastq
Diane Trout [Tue, 21 Jun 2016 21:30:50 +0000 (14:30 -0700)]
Implement writing to compressed files for qseq2fastq

Along the way refactor some of the code I had in
desplit_fastq to make it easier to share the open compressed
streams logic

8 years agoExtract part of get_json into get_response
Diane Trout [Wed, 20 Apr 2016 22:48:54 +0000 (15:48 -0700)]
Extract part of get_json into get_response

For some experiments I wanted the ability to grab
the raw requests response, previously it was hidden
by just directly returning response.json()

8 years agoInitial implementation of importencoded
Diane Trout [Mon, 11 Apr 2016 22:48:33 +0000 (15:48 -0700)]
Initial implementation of importencoded

This version reads from a json dump file and dumps it
into postgresql using sqlalchemy.

Considering the rest of htsworkflow uses django it might
be better to switch to using django's ORM and also to take advantage
of requests.

8 years agoIncrease size of Library.multiplex_id field
Diane Trout [Sat, 12 Mar 2016 01:05:23 +0000 (17:05 -0800)]
Increase size of Library.multiplex_id field

8 years agoreport run_type
Diane Trout [Thu, 3 Dec 2015 22:48:39 +0000 (14:48 -0800)]
report run_type

8 years agoreport if a flowcell was single or paired ended as a file property
Diane Trout [Thu, 3 Dec 2015 22:26:36 +0000 (14:26 -0800)]
report if a flowcell was single or paired ended as a file property

8 years agoremove unused imports and variables
Diane Trout [Thu, 3 Dec 2015 19:28:31 +0000 (11:28 -0800)]
remove unused imports and variables

8 years agomake a more informative log message
Diane Trout [Mon, 30 Nov 2015 21:48:30 +0000 (13:48 -0800)]
make a more informative log message

8 years agoRead the first sequence out of the fastq to find the read_length
Diane Trout [Mon, 30 Nov 2015 21:47:33 +0000 (13:47 -0800)]
Read the first sequence out of the fastq to find the read_length

For some reason we had a flowcell where the sequencer thought
there were 66 cycles but the file only had 50.

8 years agorefactor encode3 spreadsheet based object creation to be a bit easier to read
Diane Trout [Mon, 30 Nov 2015 20:16:59 +0000 (12:16 -0800)]
refactor encode3 spreadsheet based object creation to be a bit easier to read

8 years agoremove wsgiref requirement
Diane Trout [Mon, 30 Nov 2015 20:16:17 +0000 (12:16 -0800)]
remove wsgiref requirement

8 years agoargparse is in versions of python we care about
Diane Trout [Wed, 11 Nov 2015 21:24:27 +0000 (13:24 -0800)]
argparse is in versions of python we care about

8 years agouse decorator syntax for registering admin urls
Diane Trout [Tue, 27 Oct 2015 18:20:13 +0000 (11:20 -0700)]
use decorator syntax for registering admin urls

8 years agoupdate dotted path for python3
Diane Trout [Tue, 27 Oct 2015 18:18:38 +0000 (11:18 -0700)]
update dotted path for python3

8 years agoupdate url to new standard url
Diane Trout [Tue, 27 Oct 2015 18:18:17 +0000 (11:18 -0700)]
update url to new standard url

8 years agoUpdate schema tests for upstreams release 33
Diane Trout [Tue, 27 Oct 2015 18:18:03 +0000 (11:18 -0700)]
Update schema tests for upstreams release 33

8 years agomake exception dotted name python3 compliant
Diane Trout [Tue, 27 Oct 2015 18:16:20 +0000 (11:16 -0700)]
make exception dotted name python3 compliant

8 years agothis works better with python 3...
Diane Trout [Tue, 20 Oct 2015 23:50:44 +0000 (16:50 -0700)]
this works better with python 3...

8 years agoapparently json.dump can write to a stream
Diane Trout [Tue, 20 Oct 2015 23:50:14 +0000 (16:50 -0700)]
apparently json.dump can write to a stream

8 years agoAdd mode to connect to the DCC and make sure the files with a .upload file are actual...
Diane Trout [Tue, 20 Oct 2015 23:49:54 +0000 (16:49 -0700)]
Add mode to connect to the DCC and make sure the files with a .upload file are actually present at the DCC

8 years agofix import path for HTTPError exception
Diane Trout [Tue, 20 Oct 2015 23:19:55 +0000 (16:19 -0700)]
fix import path for HTTPError exception

8 years agofix typo, use print_function
Diane Trout [Tue, 20 Oct 2015 23:19:39 +0000 (16:19 -0700)]
fix typo, use print_function

8 years agoadd knowledge about file links
Diane Trout [Tue, 20 Oct 2015 23:18:49 +0000 (16:18 -0700)]
add knowledge about file links

8 years agoupdates to deal with encoded 33 path changes
Diane Trout [Tue, 20 Oct 2015 23:18:37 +0000 (16:18 -0700)]
updates to deal with encoded 33 path changes

8 years agoMerge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
Diane Trout [Tue, 20 Oct 2015 23:17:47 +0000 (16:17 -0700)]
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7

8 years agomove run_aws_cp command out of class to make it easier to use from other scripts
Diane Trout [Tue, 20 Oct 2015 23:17:14 +0000 (16:17 -0700)]
move run_aws_cp command out of class to make it easier to use from other scripts

8 years agoReturn read_length for file properties
Diane Trout [Thu, 24 Sep 2015 18:49:18 +0000 (11:49 -0700)]
Return read_length for file properties