diff --git a/conda/build_conda_package.sh b/conda/build_conda_package.sh index 923498e7c0c8e5f36293437226e41bfec78ae400..141d1962185b9349a28a9b463e0eb9879be79855 100755 --- a/conda/build_conda_package.sh +++ b/conda/build_conda_package.sh @@ -1,5 +1,5 @@ if [ "$(uname)" == "Linux" ]; then - conda build . -c conda-forge + conda build . -c main -c conda-forge else conda build . fi diff --git a/docs/install.rst b/docs/install.rst index a8e159d219f3ec5a9c691234333f62156225763d..d52759427a7730e483d3410e844f7f5c192ee001 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -14,8 +14,8 @@ The easy way |trex| supports all major platforms. There is an easy way to install |trex| using Anaconda, by creating a new virtual environment (here named ``tracking``, which you can replace):: - conda create -n tracking -c trexing trex # macOS, Windows - conda create -n tracking -c conda-forge -c trexing trex # Linux + conda create -n tracking -c trexing trex # macOS, Windows + conda create -n tracking -c main -c conda-forge -c trexing trex # Linux The down-side is that pre-built binaries are compiled with fewer optimzations and features than a manually compiled one (due to compatibility and licensing issues) and thus are slightly slower =(. For example, the conda version does not offer support for Basler cameras. If you need to use |grabs| with machine vision cameras, or need as much speed as possible/the newest version, please consider compiling the software yourself. @@ -50,8 +50,8 @@ This runs ``conda build .``, which builds the program according to all the setti After compilation was successful, |trex| can be installed using:: - conda create -n tracking -c local trex # macOS, Windows - conda create -n tracking -c conda-forge -c local trex # Linux + conda create -n tracking -c local trex # macOS, Windows + conda create -n tracking -c main -c conda-forge -c local trex # Linux Notice there is a ``-c local``, instead of the ``-c trexing`` from the first section.