diff --git a/README.md b/README.md index 00e5355..7b41ff1 100644 --- a/README.md +++ b/README.md @@ -110,10 +110,13 @@ We also recommend installing *IMGStore* from conda After installing imgstore from any location, you should check it's tests pass to guarantee that you have a trustworthy OpenCV version -## Installing from source +## Installing from source and with all dependencies * git clone this repository - * `conda env create -f environment.yaml` + * `conda env create -f environment.yml` + +If you are on MacOSX + * `conda env create -f environment-mac.yml` ## Installing from pypi @@ -133,27 +136,6 @@ Note: If you install from pypi you have to that you have to ensure that opencv i installed and has the required functionality (such as mp4 write support if required). Remember to run the tests `imgstore-test` after installing from pypi. -## Install in Mac OS X - -Install [Homebrew](https://brew.sh/), you probably have to install Xcode first. - -Then run: - -```sh -PATH="/usr/local/bin:$PATH" - -brew install python - -brew tap homebrew/science -brew install opencv3 --with-ffmpeg - -# follow the instructions at the end of the install -echo /usr/local/opt/opencv3/lib/python2.7/site-packages >> /usr/local/lib/python2.7/site-packages/opencv3.pth - -# install imgstore -pip install imgstore -``` - ## Post install testing You should always run the command `imgstore-test` after installing imgstore. If your diff --git a/environment-mac.yml b/environment-mac.yml new file mode 100644 index 0000000..400d0e1 --- /dev/null +++ b/environment-mac.yml @@ -0,0 +1,26 @@ +name: imgstore + +channels: + - conda-forge + - defaults + +dependencies: + - conda-forge::ffmpeg=4.0.2 + + - opencv=3.4.2 + + - python-dateutil + - pytz + - tzlocal + + - pyyaml + - numpy + - pandas + - bloscpack + + - pytest + - pytest-cov + - pytest-pep8 + + - pip: + - "--editable=./"