Skip to content

Commit

Permalink
Some changes made for anaconda packaging...
Browse files Browse the repository at this point in the history
  • Loading branch information
tubiana committed Apr 6, 2019
1 parent 67428df commit d1c571e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 21 deletions.
24 changes: 7 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,18 @@ Link to the GUI : https://github.com/tubiana/ttclustGUI

## Installation

### Instalation with PIP
### Instalation with Conda
If you want an easy installation of ttclust, I suggest these steps:

TTclust can be install from the Python Package index with
`pip install ttclust`
1. If you don't have conda (or Python) installed, Install miniconda (https://docs.conda.io/en/latest/miniconda.html) (with Python3, it's the future...)
2. Install with the command `conda install -c tubiana -c conda-forge ttclust`

You can simply use ttclust then with `ttclust`
### Instalation with PIP
1. Install numpy and cython with pip : `pip install cython numpy`
2. Install ttclust `pip install ttclust`

NOTE : You need to install numpy & mdtraj first, either with pip (`pip instal numpy mdtraj`) or conda (`conda install -c omnia mdtraj`).
I strongly suggest you to use conda because pip will compile mdtraj and increase the the chance that the install fails (cgg/microsoft visual C++ library....).

### Instalation with Conda
If you want an "easy" installation of ttclust within a conda environement, I suggest these steps:

1. Install miniconda (https://docs.conda.io/en/latest/miniconda.html)
2. Download environement file
`wget https://raw.githubusercontent.com/tubiana/TTClust/master/create_envir_with_ttclust.yml`
3. install the environement (it will install ttclust from PyPI at the end):
`conda env create -f create_envir_with_ttclust.yml`
4. Now TTClust is installed, just activate the environement to run `ttclust` command :
`conda activate ttclust`
`ttclust -f <...> -t <...>`

### Installation & usage from sources

1. Clone this repo `git clone https://github.com/tubiana/ttclust`
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

MAJOR = 4
MINOR = 6
PATCH = 6
PATCH = 7
VERSION = "{}.{}.{}".format(MAJOR, MINOR, PATCH)

with open("ttclust/version.py", "w") as f:
Expand Down
1 change: 1 addition & 0 deletions ttclust/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
from .version import __version__
8 changes: 6 additions & 2 deletions ttclust/ttclust.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# -*- coding: utf-8 -*-

__author__ = "Thibault TUBIANA"
__version__ = "4.6.5"
__license__ = "GNU GPLv3"
__date__ = "2018/02"

Expand All @@ -22,7 +21,12 @@
import progressbar as pg
import scipy.cluster.hierarchy as sch

from version import __version__
try :
#This if the "builded" import version
from .version import __version__
except:
#for usage from sources
from version import __version__

from prettytable import PrettyTable
from sklearn import manifold
Expand Down
2 changes: 1 addition & 1 deletion ttclust/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '4.6.6'
__version__ = '4.6.7'

0 comments on commit d1c571e

Please sign in to comment.