Skip to content

Commit

Permalink
Removed wormtable references from README
Browse files Browse the repository at this point in the history
Also minor changes to change wormtable related values elsewhere.
  • Loading branch information
jeromekelleher committed Mar 30, 2015
1 parent b1809e3 commit 7ed8f1d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 29 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ python:
- "2.7"

before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq libdb-dev
- wget 'http://www.well.ox.ac.uk/~jk/wheelhouse.tar'
- tar -xvf wheelhouse.tar

Expand Down
28 changes: 4 additions & 24 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ To deploy on Apache on Debian/Ubuntu platforms, do the following.

- Install some basic pre-requisite packages::

$ sudo apt-get install python-dev zlib1g-dev libdb-dev
$ sudo apt-get install python-dev zlib1g-dev

- Install Apache and mod_wsgi, and enable mod_wsgi::

Expand Down Expand Up @@ -203,21 +203,10 @@ Client tools
Prerequisites:

* Python 2.7,
* Berkeley DB together with include and lib files (version 4.8 or higher),
* Virtualenv (or another python sandboxing tool) is highly recommended.

General installation procedure:

* Install Berkeley DB (version 4.8 or higher) using your system's preferred
package manager, see the `wormtable help page
<https://pypi.python.org/pypi/wormtable>`_ for platform-specific details.

* (On MacOS X, make sure the LDFLAGS and CFLAGS environment variables are set to
include the lib and include directories for the Berkeley DB install of your choice.
The wormtable help page cited above provides more detailed instructions, or
see the `System specific install examples`_ section for an example install
on that platform.)

* Create a python sandbox directory using virtualenv, preferably
*not* inside the ga4gh server directory. For an good introduction
to using virtualenv, see the `Python Guide page
Expand Down Expand Up @@ -277,26 +266,17 @@ Example client queries

To run queries against this server, we can use the ``ga4gh_client`` program;
for example, here we run the ``variants/search`` method over the
``1000g_2013.wt`` variant set, where the reference name is ``1``
and we only want calls returned for call set ID HG03279::

$ ga4gh_client variants-search http://localhost:8000/v0.5.1 -V 1000g_2013.wt -r 1 -c HG03279 | less -S

We can also query against the *variant name*; here we return the variant that
has variant name ``rs75454623``::

$ ga4gh_client variants-search http://localhost:8000/v0.5.1 -V 1000g_2013.wt -r 1 -n rs75454623 | less -S

``1000g_2013`` variant set, where the reference name is ``1``
and we only want calls returned for call set ID `1000g_2013.HG03279`::

$ ga4gh_client variants-search http://localhost:8000/v0.5.1 -V 1000g_2013 -r 1 -c 1000g_2011.HG03279 | less -S

++++++++++++++++++++++++++++++++
System specific install examples
++++++++++++++++++++++++++++++++

MacOS X (with MacPorts)::

$ sudo port install db48
$ export CFLAGS=-I/opt/local/include/db48/ LDFLAGS=-L/opt/local/lib/db48/
$ cd [some working directory outside the ga4gh server directory tree]
$ virtualenv --no-site-packages testenv
$ source testenv/bin/activate
Expand Down
7 changes: 4 additions & 3 deletions ga4gh/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@
# (64 bit signed integer)
# http://avro.apache.org/docs/1.7.7/spec.html#schema_primitive
# AVRO_LONG_MAX = (1 << 63) - 1
# TODO in the meantime, this is the max value wormtable can handle
# TODO change this now that wormtable has been removed?
AVRO_LONG_MAX = (1 << 32) - 2
# TODO in the meantime, this is the max value pysam can handle
# This should be removed once pysam input sanitisation has been
# implemented.
AVRO_LONG_MAX = 2**31 - 1


def setCommaSeparatedAttribute(request, args, attr):
Expand Down

0 comments on commit 7ed8f1d

Please sign in to comment.