Merge branch 'master' into release

README.rst

@@ -173,26 +173,24 @@ self-contained and complete.
 
 
 Usage from Java
-------------
+---------------
 
 You can use Bitshuffle even in Java and the routines for shuffling and unshuffling
 are ported into `snappy-java`_. To use the routines, you need to add the following
-dependency to your pom.xml:
-::
+dependency to your pom.xml::
 
     <dependency>
       <groupId>org.xerial.snappy</groupId>
       <artifactId>snappy-java</artifactId>
       <version>1.1.3-M1</version>
     </dependency>
 
-First, import org.xerial.snapy.BitShuffle in your Java code:
-::
+First, import org.xerial.snapy.BitShuffle in your Java code::
 
     import org.xerial.snappy.BitShuffle;
 
-Then, you use them like this:
-::
+Then, you use them like this::
+
     int[] data = new int[] {1, 3, 34, 43, 34};
     byte[] shuffledData = BitShuffle.bitShuffle(data);
     int[] result = BitShuffle.bitUnShuffleIntArray(shuffledData);

setup.py

@@ -19,7 +19,7 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 3
-VERSION_POINT = 0
+VERSION_POINT = 1
 
 # Only unset in the 'release' branch and in tags.
 VERSION_DEV = 0
@@ -232,15 +232,15 @@ def finalize_options(self):
     cmdclass = {'build_ext': build_ext, 'install': install, 'develop': develop},
     install_requires = ['numpy', 'h5py', 'Cython', 'setuptools>=0.7'],
     #extras_require = {'H5':  ["h5py"]},
-    package_data={'': ['data/*']},
+    package_data = {'': ['data/*']},
 
     # metadata for upload to PyPI
     author = "Kiyoshi Wesley Masui",
     author_email = "[email protected]",
     description = "Bitshuffle filter for improving typed data compression.",
     license = "MIT",
     url = "https://github.com/kiyo-masui/bitshuffle",
-    #download_url = "https://github.com/kiyo-masui/bitshuffle/tarball/0.2.3",
+    download_url = "https://github.com/kiyo-masui/bitshuffle/tarball/%s" % VERSION,
     keywords = ['compression', 'hdf5', 'numpy'],
 )