Skip to content

Commit c4a0147

Browse files
committed
CI: use versioneer, for PEP440 version strings pandas-dev#9518
use binstar build OSX stack testing, pandas-dev#7127
1 parent bfe5a7f commit c4a0147

13 files changed

+2215
-111
lines changed

.binstar.yml

+11-21
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
package: pandas
22
user: jreback
33

4-
platform:
5-
#- osx-64
6-
#- linux-32
7-
- linux-64
8-
- win-64
9-
#- win-32
10-
11-
engine:
12-
#- python=2.6
13-
- python=2.7
14-
#- python=3.3
15-
#- python=3.4
4+
install:
5+
- conda config --add channels pandas
166

177
before_script:
188
- python -V
199

10+
platform:
11+
- linux-64
12+
#- linux-32
13+
- osx-64
14+
#- win-32
15+
- win-64
16+
engine:
17+
- python=2.7
18+
#- python=3.4
2019
script:
2120
- conda build conda.recipe --quiet
2221

@@ -27,12 +26,3 @@ build_targets: conda
2726
notifications:
2827
email:
2928
recipients: ['jeff@reback.net']
30-
31-
---
32-
platform: win-32
33-
engine: python=2.6
34-
exclude: true
35-
---
36-
platform: win-64
37-
engine: python=2.6
38-
exclude: true

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
*.dta binary
1414
*.xls binary
1515
*.xlsx binary
16+
pandas/_version.py export-subst

.gitignore

-4
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@ scikits
7878
*.c
7979
*.cpp
8080

81-
# Things specific to this project #
82-
###################################
83-
pandas/version.py
84-
8581
# Documentation generated files #
8682
#################################
8783
doc/source/generated

MANIFEST.in

+2
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ global-exclude *.png
2424
# recursive-include doc/source *
2525
# recursive-include doc/sphinxext *
2626
# recursive-include LICENSES *
27+
include versioneer.py
28+
include pandas/_version.py

conda.recipe/bld.bat

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
@echo off
2-
%PYTHON% setup.py install --quiet
2+
3+
conda remove jinja2 --quiet
4+
conda install jinja2 --quiet
5+
%PYTHON% setup.py install

conda.recipe/build.sh

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

conda.recipe/meta.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
2-
name: pandas
3-
version: {{ environ.get('GIT_DESCRIBE_TAG', '') }}
2+
name: pandas
3+
version: {{ environ.get('GIT_DESCRIBE_TAG', '').replace('.dev', 'dev') }}
44

55
build:
66
number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
@@ -28,10 +28,9 @@ requirements:
2828
test:
2929
requires:
3030
- nose
31-
- coverage
3231

3332
commands:
34-
- python -c "import pandas"
33+
- nosetests --exe -A "not slow and not network and not disabled" pandas
3534

3635
about:
3736
home: http://pandas.pydata.org

doc/source/whatsnew/v0.17.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ users upgrade to this version.
1414
Highlights include:
1515

1616
- Release the Global Interpreter Lock (GIL) on some cython operations, see :ref:`here <whatsnew_0170.gil>`
17+
- Development installed versions of pandas will now have ``PEP440`` compliant version strings (:issue:`9518`)
1718

1819
Check the :ref:`API Changes <whatsnew_0170.api>` and :ref:`deprecations <whatsnew_0170.deprecations>` before updating.
1920

pandas/__init__.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
_np_version_under1p9 = LooseVersion(_np_version) < '1.9'
3030

3131

32-
from pandas.version import version as __version__
3332
from pandas.info import __doc__
3433

3534

@@ -57,3 +56,8 @@
5756
from pandas.util.print_versions import show_versions
5857
import pandas.util.testing
5958

59+
# use the closest tagged version if possible
60+
from ._version import get_versions
61+
v = get_versions()
62+
__version__ = v.get('closest-tag',v['version'])
63+
del get_versions, v

0 commit comments

Comments
 (0)