Skip to content

Commit

Permalink
Merge pull request #36 from 4dn-dcic/hic2cool_scipy_2.7
Browse files Browse the repository at this point in the history
Pin pandas version for py2 and add some readme stuff
  • Loading branch information
carlvitzthum authored Jul 8, 2019
2 parents a6c83b6 + 080e312 commit bf2719d
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 2 deletions.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ The hic parsing code is based off the [straw project](https://github.com/theaide

## Important

If you converted a hic file using a version of hic2cool lower than 0.5.0, please update your cooler file with the [new update function](#updating-hic2cool-coolers).
* hic2cool currently supports Python 2.7 and Python 3.x. **Support for Python 2 will end upon its end of life on January 1st, 2020.** Visit [the official countdown clock](https://pythonclock.org/) for more information.

* If you converted a hic file using a version of hic2cool lower than 0.5.0, please update your cooler file with the [new update function](#updating-hic2cool-coolers).

## Using the Python package
```
Expand Down Expand Up @@ -124,6 +126,8 @@ You may also provide the optional `-e` flag, which will cause the mitchondrial c


## Changelog
### 0.7.3
* Pinned `pandas==0.24.2` since newer versions deprecate python 2
### 0.7.2
* Warning from `hic2cool_utils.parse_hic` will now output chromsome names, not indices
### 0.7.1
Expand Down
2 changes: 1 addition & 1 deletion hic2cool/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.7.2"
__version__ = "0.7.3"
1 change: 1 addition & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
h5py==2.8.0
pandas==0.24.2
numpy==1.16.3
scipy==1.2.1
cooler==0.8.5
2 changes: 2 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
'h5py>=2.8.0',
'numpy>=1.10.1,<=1.16.3',
'scipy<=1.2.1',
'pandas<=0.24.2',
'cooler>=0.8.5'

]

this_version = io.open(path.join(this_directory, "hic2cool/_version.py")).readlines()[-1].split()[-1].strip("\"'")
Expand Down

0 comments on commit bf2719d

Please sign in to comment.