CI: use versioneer to have PEP440 versions

.binstar.yml

@@ -1,22 +1,21 @@
 package: pandas
 user: jreback
 
-platform:
- #- osx-64
- #- linux-32
- - linux-64
- - win-64
- #- win-32
-
-engine:
- #- python=2.6
- - python=2.7
- #- python=3.3
- #- python=3.4
+install:
+  - conda config --add channels pandas
 
 before_script:
   - python -V
 
+platform:
+  - linux-64
+  #- linux-32
+  - osx-64
+  #- win-32
+  - win-64
+engine:
+  - python=2.7
+  #- python=3.4
 script:
   - conda build conda.recipe --quiet
 
@@ -27,12 +26,3 @@ build_targets: conda
 notifications:
   email:
     recipients: ['[email protected]']
-
----
-platform: win-32
-engine: python=2.6
-exclude: true
----
-platform: win-64
-engine: python=2.6
-exclude: true

.gitattributes

@@ -13,3 +13,4 @@
 *.dta binary
 *.xls binary
 *.xlsx binary
+pandas/_version.py export-subst

.gitignore

@@ -78,10 +78,6 @@ scikits
 *.c
 *.cpp
 
-# Things specific to this project #
-###################################
-pandas/version.py
-
 # Documentation generated files #
 #################################
 doc/source/generated

MANIFEST.in

@@ -24,3 +24,5 @@ global-exclude *.png
 # recursive-include doc/source *
 # recursive-include doc/sphinxext *
 # recursive-include LICENSES *
+include versioneer.py
+include pandas/_version.py

conda.recipe/bld.bat

@@ -1,2 +1,5 @@
 @echo off
-%PYTHON% setup.py install --quiet
+
+conda remove jinja2 --quiet
+conda install jinja2 --quiet
+%PYTHON% setup.py install

conda.recipe/build.sh

@@ -1,2 +1,3 @@
-#!/bin/bash
-$PYTHON setup.py install --quiet
+#!/bin/sh
+
+$PYTHON setup.py install

conda.recipe/meta.yaml

@@ -1,6 +1,6 @@
 package:
-  name: pandas
-  version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
+    name: pandas
+    version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('.dev', 'dev') }}
 
 build:
     number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
@@ -28,10 +28,9 @@ requirements:
 test:
   requires:
     - nose
-    - coverage
 
   commands:
-    - python -c "import pandas"
+    - nosetests --exe -A "not slow and not network and not disabled" pandas
 
 about:
   home: http://pandas.pydata.org

doc/source/whatsnew/v0.17.0.txt

@@ -14,6 +14,7 @@ users upgrade to this version.
 Highlights include:
 
   - Release the Global Interpreter Lock (GIL) on some cython operations, see :ref:`here <whatsnew_0170.gil>`
+  - Development installed versions of pandas will now have ``PEP440`` compliant version strings (:issue:`9518`)
 
 Check the :ref:`API Changes <whatsnew_0170.api>` and :ref:`deprecations <whatsnew_0170.deprecations>` before updating.
 

pandas/__init__.py

@@ -29,7 +29,6 @@
 _np_version_under1p9 = LooseVersion(_np_version) < '1.9'
 
 
-from pandas.version import version as __version__
 from pandas.info import __doc__
 
 
@@ -57,3 +56,8 @@
 from pandas.util.print_versions import show_versions
 import pandas.util.testing
 
+# use the closest tagged version if possible
+from ._version import get_versions
+v = get_versions()
+__version__ = v.get('closest-tag',v['version'])
+del get_versions, v