kapteyn removed from requirements, it's optional, version string incl…

…udes beta

docs/source/conf.py

@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 #
 # vaex documentation build configuration file, created by
@@ -141,7 +142,7 @@ def system(cmd):
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-html_theme_options = dict(analytics_id='UA-60052576-1')
+html_theme_options = {}#dict(analytics_id='UA-60052576-1')
 
 # Add any paths that contain custom themes here, relative to this directory.
 #html_theme_path = []

python/vaex/version.py

@@ -2,7 +2,7 @@
 major = 1
 minor = 0
 patch = 0
-pre_release = "alpha.3"
+pre_release = "beta.1"
 
 #versiontring = '0.2.42-g54a6613'
 versiontuple = (major, minor, patch)

requirements.txt

@@ -17,9 +17,9 @@ future
 pyyaml
 layeredconfig
 #http://www.astro.rug.nl/software/kapteyn/kapteyn-2.3.tar.gz
-git+https://github.com/kapteyn-astro/kapteyn#egg=kapteyn
+#git+https://github.com/kapteyn-astro/kapteyn#egg=kapteyn
 cachetools
-healpy
+#healpy
 progressbar2
 # sphinxcontrib-googleanalytics # for building the docs
 attrdict

setup.py

@@ -194,14 +194,14 @@ def run(self):
 	name="vaex", #vaex.__program_name__,
 	author="Maarten A. Breddels",
 	author_email="maartenbreddels@gmail.com",
-    version = "%d.%d.%d" % version.versiontuple,
+    version = version.versionstring, #"%d.%d.%d" % version.versiontuple,
     data_files=DATA_FILES,
     options={'py2app': OPTIONS},
     #setup_requires=['py2app'],
     #setup_requires=["sphinx"],
     includes=["vaex", "md5", "astropy", "aplus", "six"],
     packages=["vaex", "vaex.ui", "vaex.test", "vaex.misc", "vaex.notebook", "vaex.file", "vaex.ui.plugin", "vaex.ui.icons"],
-    #install_requires=reqs,
+    install_requires=reqs,
     entry_points={ 'console_scripts': [ 'vaex=vaex.ui.main:main']  },
     ext_modules=extensions,
     package_data={'vaex': ['ui/icons/*.png']},