Skip to content
This repository was archived by the owner on Apr 19, 2022. It is now read-only.

Commit 7b01480

Browse files
author
Wouter de Bie
committed
Move documentation to readthedocs.org
1 parent 41fd330 commit 7b01480

9 files changed

Lines changed: 38 additions & 54 deletions

File tree

README.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,13 @@ To install snakebite 2.x run:
3131

3232
pip install snakebite
3333

34-
35-
3634
To install snakebite 2.x with Kerberos/SASL support, make sure you can install python-krbV (https://fedorahosted.org/python-krbV/) and then run:
3735

3836
pip install "snakebite[kerberos]"
3937

40-
41-
4238
Documentation
4339
*************
44-
More information and documentation can be found at http://spotify.github.io/snakebite/
40+
More information and documentation can be found at http://snakebite.readthedocs.org/en/latest/
4541

4642
Development
4743
***********
@@ -50,6 +46,9 @@ Make sure to read about development `here <http://spotify.github.io/snakebite/de
5046
Travis CI status
5147
****************
5248

53-
.. image:: https://api.travis-ci.org/spotify/snakebite.png
49+
|Travis|_
50+
51+
.. |Travis| image:: https://api.travis-ci.org/spotify/snakebite.png
52+
.. _Travis: https://travis-ci.org/spotify/snakebite
5453

5554
Copyright 2013-2014 Spotify AB

doc/create_gh_pages

Lines changed: 0 additions & 18 deletions
This file was deleted.

doc/source/cli.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,13 @@ Last two methods of providing config for snakebite is through hadoop config file
5050
If ``HADOOP_HOME`` environment variable is set, snakebite will try to find ``core-site.xml``
5151
and/or ``hdfs-site.xml`` files in ``$HADOOP_HOME`` directory. If ``HADOOP_HOME`` is not set,
5252
snakebite will try to find those files in a couple of default hadoop config locations:
53-
* /etc/hadoop/conf/core-site.xml
54-
* /usr/local/etc/hadoop/conf/core-site.xml
55-
* /usr/local/hadoop/conf/core-site.xml
56-
* /etc/hadoop/conf/hdfs-site.xml
57-
* /usr/local/etc/hadoop/conf/hdfs-site.xml
58-
* /usr/local/hadoop/conf/hdfs-site.xml
53+
54+
* /etc/hadoop/conf/core-site.xml
55+
* /usr/local/etc/hadoop/conf/core-site.xml
56+
* /usr/local/hadoop/conf/core-site.xml
57+
* /etc/hadoop/conf/hdfs-site.xml
58+
* /usr/local/etc/hadoop/conf/hdfs-site.xml
59+
* /usr/local/hadoop/conf/hdfs-site.xml
5960

6061
Bash completion
6162
===============

doc/source/client.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
**************
22
Client library
33
**************
4-
.. automodule:: client
4+
.. automodule:: snakebite.client
55

66
.. autoclass:: Client
77
:members:

doc/source/conf.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
import sys
1515
import os
1616

17-
import sphinx_rtd_theme
17+
source_path = os.path.abspath(os.path.dirname(os.path.abspath(__file__)) + '../../../')
18+
sys.path.append(source_path)
1819

20+
import sphinx_rtd_theme
1921
import snakebite.version
2022

2123
# If extensions (or modules to document with autodoc) are in another directory,
2224
# add these directories to sys.path here. If the directory is relative to the
2325
# documentation root, use os.path.abspath to make it absolute, like shown here.
24-
sys.path.insert(0, os.path.abspath('../../snakebite'))
26+
27+
2528

2629
# -- General configuration -----------------------------------------------------
2730

doc/source/development.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
***********
22
Development
33
***********
4-
54
How to start
65
============
76

@@ -11,20 +10,20 @@ it's not required to but highly recommended. To install, and create development
1110
environment for snakebite:
1211

1312
1. install virtualenvwrapper:
14-
``$ pip install virtualenvwrapper``
13+
``$ pip install virtualenvwrapper``
1514
2. create development environment:
16-
``$ mkvirtualenv snakebite_dev``
15+
``$ mkvirtualenv snakebite_dev``
1716

1817
More about virtualenvwrapper and virtualenv `here <http://virtualenvwrapper.readthedocs.org/en/latest/>`_
1918

2019
Below is the list of recommended steps to start development:
2120

2221
1. clone repo:
23-
``$ git clone git@github.com:spotify/snakebite.git``
22+
``$ git clone git@github.com:spotify/snakebite.git``
2423
2. fetch all developer requirements:
25-
``$ pip install -r requirements-dev.txt``
24+
``$ pip install -r requirements-dev.txt``
2625
3. run tests:
27-
``$ python setup.py test``
26+
``$ python setup.py test``
2827

2928
If tests succeeded you are ready to hack! Remember to always test
3029
your changes and please come back with a PR <3

doc/source/minicluster.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
***********
22
Minicluster
33
***********
4-
.. automodule:: minicluster
4+
.. automodule:: snakebite.minicluster
55

66
.. autoclass:: MiniCluster
77
:members:

doc/source/testing.rst

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ performance overhead - but it's not a problem (yet).
1212
Snakebite by default uses `nose <https://nose.readthedocs.org/en/latest/>`_
1313
and `tox <https://tox.readthedocs.org/en/latest/>`_ for testing. Tests
1414
are integrated with `setup.py`, so to start tests one can simply:
15-
``$ python setup.py test``
15+
``$ python setup.py test``
1616

1717
Because we require minicluster to fully test snakebite,
1818
java needs to be present on the system.
@@ -39,7 +39,7 @@ We bootstrap environment with ``pip install -r requirements-dev.txt`` (deps sect
3939
And then we setup environment via ``/scripts/ci/setup_env.sh`` script.
4040
``setup_env.sh`` script downloads hadoop distribution tar, and extracts it.
4141
Help for ``setup_env.sh``::
42-
Setup environment for snakebite tests
42+
Setup environment for snakebite tests
4343

4444
options:
4545
-h, --help show brief help
@@ -80,12 +80,12 @@ fresh and isolated test environments using Docker.
8080
Currently we use base testing image ``ravwojdyla/snakebite_test:base``,
8181
it was created using ``/scripts/build-base-test-docker.sh`` and
8282
``/scripts/Dockerfile``. Base test image is a Ubuntu Trusty with:
83-
* oracle java 7
84-
* python 2.6
85-
* python 2.7
86-
* pip
87-
* CDH distribution
88-
* HDP distribution
83+
* oracle java 7
84+
* python 2.6
85+
* python 2.7
86+
* pip
87+
* CDH distribution
88+
* HDP distribution
8989

9090
Base docker image doesn't change, to create new test image with
9191
current working tree, based on ``ravwojdyla/snakebite_test:base``:
@@ -95,10 +95,10 @@ current working tree, based on ``ravwojdyla/snakebite_test:base``:
9595
Fig will create new image based on ``ravwojdyla/snakebite_test:base``,
9696
with current working tree, that can be used for tests.
9797
Fig currently specifies 4 tests:
98-
* ``testPy26cdh``: python 2.6 + CDH
99-
* ``testPy26hdp``: python 2.6 + HDP
100-
* ``testPy27cdh``: python 2.7 + CDH
101-
* ``testPy27hdp``: python 2.7 + HDP
98+
* ``testPy26cdh``: python 2.6 + CDH
99+
* ``testPy26hdp``: python 2.6 + HDP
100+
* ``testPy27cdh``: python 2.7 + CDH
101+
* ``testPy27hdp``: python 2.7 + HDP
102102

103103
To run specific test (eg. testPy26cdh):
104104

snakebite/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,13 +1017,13 @@ def serverdefaults(self, force_reload=False):
10171017
10181018
:param force_reload: Should the server defaults be reloaded even if they already exist?
10191019
:type force_reload: bool
1020-
:returns: dictionary with the following keys: blockSize, bytesPerChecksum, writePacketSize, replication,
1021-
fileBufferSize, encryptDataTransfer, trashInterval, checksumType
1020+
:returns: dictionary with the following keys: blockSize, bytesPerChecksum, writePacketSize, replication, fileBufferSize, encryptDataTransfer, trashInterval, checksumType
10221021
10231022
**Example:**
10241023
10251024
>>> client.serverdefaults()
10261025
[{'writePacketSize': 65536, 'fileBufferSize': 4096, 'replication': 1, 'bytesPerChecksum': 512, 'trashInterval': 0L, 'blockSize': 134217728L, 'encryptDataTransfer': False, 'checksumType': 2}]
1026+
10271027
'''
10281028

10291029
if not self._server_defaults or force_reload:

0 commit comments

Comments
 (0)