From 2b558b59cce977dbe12e02a70d3ac34b31a67099 Mon Sep 17 00:00:00 2001 From: Calum Chamberlain Date: Mon, 27 Jun 2016 15:32:29 +1200 Subject: [PATCH 1/2] Bump version number for release --- eqcorrscan/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eqcorrscan/__init__.py b/eqcorrscan/__init__.py index 8dd6d8d17..b876ac8c5 100755 --- a/eqcorrscan/__init__.py +++ b/eqcorrscan/__init__.py @@ -36,7 +36,7 @@ __all__ = ['core', 'utils', 'par'] -__version__ = '0.1.2rc' +__version__ = '0.1.2' # Cope with changes to name-space to remove most of the camel-case _import_map = { From 0b631053a54d297d92d4802ed1e9e8d2eb06a10d Mon Sep 17 00:00:00 2001 From: Calum Chamberlain Date: Tue, 28 Jun 2016 08:25:49 +1200 Subject: [PATCH 2/2] Update README.md --- README.md | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index 4874930c0..43369e0f0 100644 --- a/README.md +++ b/README.md @@ -14,43 +14,8 @@ Windows systems. We support Python versions 2.7 and 3.5. The codes likely work on Py 3.4 too, but we currently don't test this and recommend users to work in Py 3.5. -Installation for all systems should be as simple as: - -```bash -pip install EQcorrscan -``` - -If upgrading from a previous version, rather than running install --upgrade, I recommend the following: - -```bash -pip install -U --no-deps EQcorrscan -``` - -This will not try to upgrade your dependencies, which is not needed. You should -to update your obspy version to 1.0.x which was recently released. We have tested -this and support it, nevertheless, if you find any issues then let us know. - -*You will likely need sudo/root permissions to run this command.* - -If you have any issues installing please report them on the issues pages. - -You will need to install openCV (note that openCV versions 2 and 3 work for -Python 2.7, but only openCV version 3 works for Python 3.x, therefore we -recommend installing openCV 3). We recommend installing openCV from source, -this will both optimize it for your machine, and ensure you don't break your python -by using conda. - -If you are running Linux or OSX, installation -instructions can be found -[here for ubuntu](http://www.pyimagesearch.com/2015/07/20/install-opencv-3-0-and-python-3-4-on-ubuntu/) -and [here for OSX](http://www.pyimagesearch.com/2015/06/15/install-opencv-3-0-and-python-2-7-on-osx/). -Note these two links are Python dependent and you will need to change your pip -and python versions appropriate to your system. Similar instructions are -available for Windows users. - -*A note for Ubuntu users* -You will need the python3.x-dev libraries to install openCV if installing from -source. +Instructions for installing EQcorrscan and the required dependency, openCV +are linked from the [docs](http://eqcorrscan.readthedocs.io/en/latest/intro.html#installation) *A note on correlation precision* OpenCV computes cross-correlations in the frequency-domain for normal seismic