Skip to content

Commit

Permalink
CI: use versioneer, for PEP440 version strings pandas-dev#9518
Browse files Browse the repository at this point in the history
    use binstar build
    OSX stack testing, pandas-dev#7127
  • Loading branch information
jreback committed Jul 6, 2015
1 parent bfe5a7f commit c4a0147
Show file tree
Hide file tree
Showing 13 changed files with 2,215 additions and 111 deletions.
32 changes: 11 additions & 21 deletions .binstar.yml
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -27,12 +26,3 @@ build_targets: conda
notifications:
email:
recipients: ['jeff@reback.net']

---
platform: win-32
engine: python=2.6
exclude: true
---
platform: win-64
engine: python=2.6
exclude: true
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
*.dta binary
*.xls binary
*.xlsx binary
pandas/_version.py export-subst
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,6 @@ scikits
*.c
*.cpp

# Things specific to this project #
###################################
pandas/version.py

# Documentation generated files #
#################################
doc/source/generated
Expand Down
2 changes: 2 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 4 additions & 1 deletion conda.recipe/bld.bat
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
@echo off
%PYTHON% setup.py install --quiet

conda remove jinja2 --quiet
conda install jinja2 --quiet
%PYTHON% setup.py install
5 changes: 3 additions & 2 deletions conda.recipe/build.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/bin/bash
$PYTHON setup.py install --quiet
#!/bin/sh

$PYTHON setup.py install
7 changes: 3 additions & 4 deletions conda.recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -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) }}
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions doc/source/whatsnew/v0.17.0.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 5 additions & 1 deletion pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
_np_version_under1p9 = LooseVersion(_np_version) < '1.9'


from pandas.version import version as __version__
from pandas.info import __doc__


Expand Down Expand Up @@ -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
Loading

0 comments on commit c4a0147

Please sign in to comment.