Skip to content

Commit

Permalink
Merge branch 'feature/background-task' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
deanishe committed Apr 6, 2014
2 parents 8e84842 + 307f546 commit b9e815f
Show file tree
Hide file tree
Showing 10 changed files with 586 additions and 162 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ A helper library in Python for authors of workflows for [Alfred 2](http://www.al

## Installation ##

1. Download the `alfred-workflow-x.x.zip` from the [releases page](https://github.com/deanishe/alfred-workflow/releases).
1. Download the `alfred-workflow-X.X.zip` from the [releases page](https://github.com/deanishe/alfred-workflow/releases).
2. Either extract the ZIP archive and place the `workflow` directory in the root folder of your workflow (where `info.plist` is) **or**
3. Place the ZIP archive in the root folder of your workflow and add `sys.path.insert(0, 'alfred-workflow-x.x.zip')` at the top of your Python script(s).
3. Place the ZIP archive in the root folder of your workflow and add `sys.path.insert(0, 'alfred-workflow-X.X.zip')` at the top of your Python script(s).

Your workflow should look something like this:

Expand All @@ -30,6 +30,7 @@ Your workflow should look something like this:
icon.png
workflow/
__init__.py
background.py
workflow.py
web.py
yourscript.py
Expand Down
9 changes: 9 additions & 0 deletions build-docs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

basedir=$(cd $(dirname $0); pwd)
docdir=${basedir}/doc
curdir=$(pwd)

cd "${docdir}"
make html
cd "${curdir}"
8 changes: 8 additions & 0 deletions doc/background.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
workflow.background
-----------------

.. automodule:: workflow.background
:members: run_in_background, is_running
:undoc-members:
:show-inheritance:

1 change: 1 addition & 0 deletions doc/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Documentation automatically generated from the source code.

workflow
web
background


Indices and tables
Expand Down
Loading

0 comments on commit b9e815f

Please sign in to comment.