Skip to content
This repository has been archived by the owner on Sep 2, 2023. It is now read-only.

Commit

Permalink
Merge dfe6215 into 2b4785e
Browse files Browse the repository at this point in the history
  • Loading branch information
fphammerle committed May 6, 2020
2 parents 2b4785e + dfe6215 commit d1a80b3
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
.coverage
.ipynb_checkpoints/
.mypy_cache/
build/
dist/
tags
Expand Down
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ dist: xenial
env:
# https://pypi.org/project/pandas/#history
- PANDAS_VERSION=
- PANDAS_VERSION=1.*
- PANDAS_VERSION=0.25.*
- PANDAS_VERSION=0.24.*
- PANDAS_VERSION=0.23.*
Expand All @@ -23,6 +24,10 @@ env:
# https://travis-ci.org/fphammerle/freesurfer-volume-reader/builds/525556257
matrix:
exclude:
# https://travis-ci.org/github/fphammerle/freesurfer-stats/jobs/683777317#L208
# https://github.com/pandas-dev/pandas/commit/18efcb27361478daa3118079ecb166c733691ecb#diff-2eeaed663bd0d25b7e608891384b7298R814
- python: 3.5
env: PANDAS_VERSION=1.*
- python: 3.7
env: PANDAS_VERSION=0.21.*
- python: 3.7
Expand Down
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# Changelog
All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Added
- compatibility with pandas v1

## [1.0.0] - 2019-06-27

[Unreleased]: https://github.com/fphammerle/freesurfer-stats/compare/1.0.0...HEAD
[1.0.0]: https://github.com/fphammerle/freesurfer-stats/tree/1.0.0
3 changes: 3 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ name = "pypi"

[packages]
freesurfer-stats = {editable = true, path = "."}
# v1.0.0 dropped support for python<3.6.1
# https://github.com/pandas-dev/pandas/commit/18efcb27361478daa3118079ecb166c733691ecb#diff-2eeaed663bd0d25b7e608891384b7298R814
pandas = "<1"

[dev-packages]
isort = "*"
Expand Down
3 changes: 2 additions & 1 deletion Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@
],
packages=setuptools.find_packages(),
install_requires=[
# hoping pandas maintainers use semantic versioning
# TODO verify lower version constraint
'pandas>=0.21,<1',
"pandas>=0.21,<2",
],
setup_requires=[
'setuptools_scm',
Expand Down

0 comments on commit d1a80b3

Please sign in to comment.