From 9fe7df6decf92161a443d8334307c630da23d884 Mon Sep 17 00:00:00 2001 From: Danilo Horta Date: Tue, 12 Apr 2016 12:56:00 +0100 Subject: [PATCH] Proper bash wget inline installation. --- .bumpversion.cfg | 2 +- README.md | 6 +++--- conda-recipe/meta.yaml | 2 +- deploy/apt_limix_install | 6 ++---- deploy/test.pypi.apt | 2 +- deploy/test.pypi.dnf | 2 +- deploy/test.pypi.zypper | 2 +- setup.py | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index b4dcb6b7..116df9ba 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,4 +1,4 @@ [bumpversion] -current_version = 0.7.68 +current_version = 0.7.69 files = setup.py conda-recipe/meta.yaml diff --git a/README.md b/README.md index 4fda96b6..18a2f7e3 100644 --- a/README.md +++ b/README.md @@ -37,17 +37,17 @@ tool. - Ubuntu ``` - wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/apt_limix_install | bash + bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/apt_limix_install) ``` - Fedora ``` - wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/dnf_limix_install | bash + bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/dnf_limix_install) ``` - OpenSUSE ``` - wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/zypper_limix_install | bash + bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/zypper_limix_install) ``` ### From source diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml index 8e3c7f8a..0a43cf73 100644 --- a/conda-recipe/meta.yaml +++ b/conda-recipe/meta.yaml @@ -1,6 +1,6 @@ package: name: limix - version: "0.7.68" + version: "0.7.69" source: path: ../ diff --git a/deploy/apt_limix_install b/deploy/apt_limix_install index 30f3346f..7bf3fa07 100755 --- a/deploy/apt_limix_install +++ b/deploy/apt_limix_install @@ -3,11 +3,9 @@ echo "Installing Limix." sudo apt-get update -sudo apt-get install build-essential libc6 gfortran g++ \ +sudo apt-get -y -q install build-essential libc6 gfortran g++ \ python python-setuptools cython python-numpy python-scipy \ python-matplotlib pkg-config libfreetype6-dev libpng12-dev \ python-h5py liblapack-dev python-pip python-pandas swig \ - python-sklearn-lib -y -pip install limix -hash -r + python-sklearn-lib pip install limix diff --git a/deploy/test.pypi.apt b/deploy/test.pypi.apt index 1049dee4..e9be00d6 100755 --- a/deploy/test.pypi.apt +++ b/deploy/test.pypi.apt @@ -2,5 +2,5 @@ sudo apt-get update -y -q sudo apt-get install wget -y -q -wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/apt_limix_install | bash +bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/apt_limix_install) python -c "import limix; print(limix.__version__)" diff --git a/deploy/test.pypi.dnf b/deploy/test.pypi.dnf index e4223bda..ad7370b7 100755 --- a/deploy/test.pypi.dnf +++ b/deploy/test.pypi.dnf @@ -6,5 +6,5 @@ if type "sudo" > /dev/null 2>&1; then fi eval "${prefix}dnf update -y -q" eval "${prefix}dnf install wget -y -q" -wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/dnf_limix_install | bash +bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/dnf_limix_install) python -c "import limix; print(limix.__version__)" diff --git a/deploy/test.pypi.zypper b/deploy/test.pypi.zypper index 5b4bb44e..84e437d7 100755 --- a/deploy/test.pypi.zypper +++ b/deploy/test.pypi.zypper @@ -2,5 +2,5 @@ zypper -n update zypper -n install wget -wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/zypper_limix_install | bash +bash <(wget -O - https://raw.githubusercontent.com/PMBio/limix/master/deploy/zypper_limix_install) python -c "import limix; print(limix.__version__)" diff --git a/setup.py b/setup.py index 142e50e0..57067fee 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ import importlib PKG_NAME = 'limix' -VERSION = '0.7.68' +VERSION = '0.7.69' WORKDIR = os.path.abspath(os.path.dirname(__file__))