Browse Source

Merge branch 'pandas1' (#4)

https://github.com/fphammerle/freesurfer-stats/pull/4
Fabian Peter Hammerle 4 years ago
parent
commit
174082ce1c
6 changed files with 27 additions and 2 deletions
  1. 1 0
      .gitignore
  2. 5 0
      .travis.yml
  3. 14 0
      CHANGELOG.md
  4. 3 0
      Pipfile
  5. 2 1
      Pipfile.lock
  6. 2 1
      setup.py

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 .coverage
 .ipynb_checkpoints/
+.mypy_cache/
 build/
 dist/
 tags

+ 5 - 0
.travis.yml

@@ -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.*
@@ -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

+ 14 - 0
CHANGELOG.md

@@ -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 - 0
Pipfile

@@ -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 = "*"

+ 2 - 1
Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "f30f0d1204c23c90ad891593d8213ef0cd35fd90b574408aab7624f3cc1ee357"
+            "sha256": "6206232ea108ca4f8ae83e7d2c6afc1f9733a579a9bcb8da112d1bb6c4a9b7a3"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -68,6 +68,7 @@
                 "sha256:e45055c30a608076e31a9fcd780a956ed3b1fa20db61561b8d88b79259f526f7",
                 "sha256:ee50c2142cdcf41995655d499a157d0a812fce55c97d9aad13bc1eef837ed36c"
             ],
+            "index": "pypi",
             "version": "==0.25.3"
         },
         "python-dateutil": {

+ 2 - 1
setup.py

@@ -49,8 +49,9 @@ setuptools.setup(
     ],
     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',