Skip to content

Commit

Permalink
Merge pull request #46 from KVSlab/morphman-v1.0
Browse files Browse the repository at this point in the history
Bump version to v1.0
  • Loading branch information
hkjeldsberg authored Sep 23, 2019
2 parents 9fd2a3a + 853bfa4 commit 41a5c7c
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Kjeldsberg et al., (2019). morphMan: Automated manipulation of vascular geometri
Installation
------------

For reference, morphMan requires the following dependencies: VTK > 8.1, Numpy > 1.13, SciPy > 1.0.0, and VMTK 1.4.
For reference, morphMan requires the following dependencies: VTK > 8.1, Numpy <= 1.13, SciPy > 1.0.0, and VMTK 1.4.
If you are on Windows, macOS or Linux you can install all the general dependencies through anaconda.
First install Anaconda or Miniconda (preferably the Python 3.6 version).
Then execute the following command
Expand Down
3 changes: 3 additions & 0 deletions conda-build/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
numpy:
- 1.13.*

python:
- 3.5.1
- 3.6.1
Expand Down
4 changes: 2 additions & 2 deletions conda-build/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: "morphman"
version: "0.3"
version: "1.0"

source:
path: ../
Expand All @@ -16,7 +16,7 @@ requirements:
run:
- python {{ python }}
- scipy
- numpy <=1.13
- numpy {{ numpy }}
- vtk {{ vtk }}
- vmtk

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@
# built documents.
#
# The short X.Y version.
version = u'0.3'
version = u'1.0'
# The full version, including alpha/beta/rc tags.
release = u'0.3'
release = u'1.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
DEPENDENCIES = [] # 'scipy', 'numpy', 'vtk']
TEST_DEPENDENCIES = [] # 'pytest']

VERSION = "0.3"
VERSION = "1.0"
URL = "https://github.com/KVSlab/morphMan.git"

setuptools.setup(
Expand Down

0 comments on commit 41a5c7c

Please sign in to comment.