Skip to content

Commit 2118db4

Browse files
committed
Merge branch 'release/0.7.1'
Conflicts: README.rst drmaa/__init__.py setup.py
2 parents bdcdfee + 884b5e4 commit 2118db4

15 files changed

+1195
-32
lines changed

.coveragerc

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[run]
2+
source = drmaa
3+
omit =
4+
*/python?.?/*
5+
*/lib-python/?.?/*.py
6+
*/lib_pypy/_*.py
7+
*/site-packages/ordereddict.py
8+
*/site-packages/nose/*
9+
*/unittest2/*

.gitignore

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
*.py[cod]
1+
# Compiled python
2+
*.pyc
3+
*.pyo
4+
__pycache__
5+
6+
7+
.DS_Store
8+
.coverage
29

310
# C extensions
411
*.so

.travis.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,30 @@ language: python
22
python:
33
- 2.6
44
- 2.7
5-
- 3.2
5+
- 3.3
66

77
notifications:
88
email: false
99

1010
# Install stuff
11+
virtualenv:
12+
system_site_packages: true
1113
before_install:
1214
- travis/install_sge.sh
1315
- export GRID_MAP_REDIS_PORT=12345
1416
- export SGE_ROOT=/var/lib/gridengine
1517
- export SGE_CELL=default
1618
- export DRMAA_LIBRARY_PATH=/usr/lib/libdrmaa.so.1.0
1719
install:
20+
- pip install python-coveralls --use-mirrors
21+
- pip install nose-cov --use-mirrors
1822
- python setup.py install
1923

2024
# Run test
2125
script:
22-
- nosetests -d -v
26+
- nosetests -d -v --with-cov --cov drmaa --cov-config .coveragerc --logging-level=DEBUG
27+
28+
# Calculate coverage
29+
after_success:
30+
- coveralls --config_file .coveragerc
2331

MANIFEST.in

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ include license.txt
22
include *.rst
33
recursive-include examples *
44
recursive-include test *
5+
recursive-include docs *

README.rst

+54-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,61 @@
1-
drmaa-python
1+
DRMAA Python
22
------------
33

4-
54
.. image:: https://travis-ci.org/drmaa-python/drmaa-python.png
65
:target: https://travis-ci.org/drmaa-python/drmaa-python
76
:alt: Travis build status
87

9-
DRMAA bindings for Python. Now Python 3 compatible.
8+
.. image:: https://coveralls.io/repos/drmaa-python/drmaa-python/badge.png
9+
:target: https://coveralls.io/r/drmaa-python/drmaa-python
10+
:alt: Test coverage
11+
12+
.. image:: https://pypip.in/d/drmaa/badge.png
13+
:target: https://crate.io/packages/drmaa
14+
:alt: PyPI downloads
15+
16+
.. image:: https://pypip.in/v/drmaa/badge.png
17+
:target: https://crate.io/packages/drmaa
18+
:alt: Latest version on PyPI
19+
20+
`Distributed Resource Management Application API <http://en.wikipedia.org/wiki/DRMAA>`__
21+
(DRMAA) bindings for Python. For more information
22+
`read the docs <http://drmaa-python.readthedocs.org>`__.
23+
24+
Requirements
25+
~~~~~~~~~~~~
26+
27+
- Python 2.6+
28+
- A DRMAA-compatible cluster (e.g., Grid Engine)
29+
30+
License
31+
~~~~~~~
32+
33+
- BSD (3 Clause)
34+
35+
Changelog
36+
~~~~~~~~~
37+
38+
- v0.7.1
39+
40+
- Add `Read The Docs documentation <http://drmaa-python.readthedocs.org>`__
41+
- Add ``const`` module identifiers back into package namespace
42+
- Remove ``b`` prefixes from strings inserted into error messages.
43+
44+
- v0.7.0
1045

46+
- String attribute issues with Python 3 have all been resolved, and now each
47+
function that takes a string can handle unicode strings, and returns
48+
unicode strings.
49+
- All code has been updated to use future imports for ``unicode_literals``
50+
and ``print_function``, so we're effectively writing Python 3 code now.
51+
- PEP8 compliance changes all over the place, except those that would break
52+
names required by underlying C DRMAA library.
53+
- Now automatically run unit tests of Travis-CI with SGE, and all tests pass
54+
for Python 2.6, 2.7, and 3.3. SGE is installed using scripts I describe
55+
in `this gist <https://gist.github.com/dan-blanchard/6586533>`__.
56+
- Unit tests are now in a top-level directory instead of a sub-directory
57+
under the drmaa package.
58+
- There is now a `session.py` module that contains most of the code that was
59+
in ``__init__.py`` before, and ``__init__`` just imports things and sets
60+
``__all__`` and ``__version__``, as is typically recommended now.
61+
- Drops support for Python 2.5.

docs/Makefile

+153
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
# Makefile for Sphinx documentation
2+
#
3+
4+
# You can set these variables from the command line.
5+
SPHINXOPTS =
6+
SPHINXBUILD = sphinx-build
7+
PAPER =
8+
BUILDDIR = _build
9+
10+
# Internal variables.
11+
PAPEROPT_a4 = -D latex_paper_size=a4
12+
PAPEROPT_letter = -D latex_paper_size=letter
13+
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
14+
# the i18n builder cannot share the environment and doctrees with the others
15+
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
16+
17+
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
18+
19+
help:
20+
@echo "Please use \`make <target>' where <target> is one of"
21+
@echo " html to make standalone HTML files"
22+
@echo " dirhtml to make HTML files named index.html in directories"
23+
@echo " singlehtml to make a single large HTML file"
24+
@echo " pickle to make pickle files"
25+
@echo " json to make JSON files"
26+
@echo " htmlhelp to make HTML files and a HTML help project"
27+
@echo " qthelp to make HTML files and a qthelp project"
28+
@echo " devhelp to make HTML files and a Devhelp project"
29+
@echo " epub to make an epub"
30+
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
31+
@echo " latexpdf to make LaTeX files and run them through pdflatex"
32+
@echo " text to make text files"
33+
@echo " man to make manual pages"
34+
@echo " texinfo to make Texinfo files"
35+
@echo " info to make Texinfo files and run them through makeinfo"
36+
@echo " gettext to make PO message catalogs"
37+
@echo " changes to make an overview of all changed/added/deprecated items"
38+
@echo " linkcheck to check all external links for integrity"
39+
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
40+
41+
clean:
42+
-rm -rf $(BUILDDIR)/*
43+
44+
html:
45+
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
46+
@echo
47+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
48+
49+
dirhtml:
50+
$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
51+
@echo
52+
@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
53+
54+
singlehtml:
55+
$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
56+
@echo
57+
@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
58+
59+
pickle:
60+
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
61+
@echo
62+
@echo "Build finished; now you can process the pickle files."
63+
64+
json:
65+
$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
66+
@echo
67+
@echo "Build finished; now you can process the JSON files."
68+
69+
htmlhelp:
70+
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
71+
@echo
72+
@echo "Build finished; now you can run HTML Help Workshop with the" \
73+
".hhp project file in $(BUILDDIR)/htmlhelp."
74+
75+
qthelp:
76+
$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
77+
@echo
78+
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
79+
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
80+
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/DRMAAPython.qhcp"
81+
@echo "To view the help file:"
82+
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/DRMAAPython.qhc"
83+
84+
devhelp:
85+
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
86+
@echo
87+
@echo "Build finished."
88+
@echo "To view the help file:"
89+
@echo "# mkdir -p $$HOME/.local/share/devhelp/DRMAAPython"
90+
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/DRMAAPython"
91+
@echo "# devhelp"
92+
93+
epub:
94+
$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
95+
@echo
96+
@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
97+
98+
latex:
99+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
100+
@echo
101+
@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
102+
@echo "Run \`make' in that directory to run these through (pdf)latex" \
103+
"(use \`make latexpdf' here to do that automatically)."
104+
105+
latexpdf:
106+
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
107+
@echo "Running LaTeX files through pdflatex..."
108+
$(MAKE) -C $(BUILDDIR)/latex all-pdf
109+
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
110+
111+
text:
112+
$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
113+
@echo
114+
@echo "Build finished. The text files are in $(BUILDDIR)/text."
115+
116+
man:
117+
$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
118+
@echo
119+
@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
120+
121+
texinfo:
122+
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
123+
@echo
124+
@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
125+
@echo "Run \`make' in that directory to run these through makeinfo" \
126+
"(use \`make info' here to do that automatically)."
127+
128+
info:
129+
$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
130+
@echo "Running Texinfo files through makeinfo..."
131+
make -C $(BUILDDIR)/texinfo info
132+
@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
133+
134+
gettext:
135+
$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
136+
@echo
137+
@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
138+
139+
changes:
140+
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
141+
@echo
142+
@echo "The overview file is in $(BUILDDIR)/changes."
143+
144+
linkcheck:
145+
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
146+
@echo
147+
@echo "Link check complete; look for any errors in the above output " \
148+
"or in $(BUILDDIR)/linkcheck/output.txt."
149+
150+
doctest:
151+
$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
152+
@echo "Testing of doctests in the sources finished, look at the " \
153+
"results in $(BUILDDIR)/doctest/output.txt."

0 commit comments

Comments
 (0)