diff --git a/SalishSeaTools/docs/development.rst b/SalishSeaTools/docs/development.rst index 786f347c..7df18b02 100644 --- a/SalishSeaTools/docs/development.rst +++ b/SalishSeaTools/docs/development.rst @@ -69,7 +69,7 @@ and building the documentation with the commands: .. code-block:: bash $ cd tools - $ conda env create -f SalishSeaTools/environment.yaml + $ conda env create -f SalishSeaTools/envs/environment-dev.yaml $ conda activate salishsea-tools (salishsea-tools)$ pip install --editable SalishSeaTools diff --git a/SalishSeaTools/environment.yaml b/SalishSeaTools/envs/environment-dev.yaml similarity index 87% rename from SalishSeaTools/environment.yaml rename to SalishSeaTools/envs/environment-dev.yaml index ec2dbe26..83bfbe22 100644 --- a/SalishSeaTools/environment.yaml +++ b/SalishSeaTools/envs/environment-dev.yaml @@ -5,11 +5,11 @@ # of the SalishSeaTools package with: # # $ cd tools -# $ conda env create -f SalishSeaTools/environment.yaml +# $ conda env create -f SalishSeaTools/envs/environment-dev.yaml # $ conda activate salishsea-tools # (salishsea-tools)$ python -m pip install --editable SalishSeaTools # -# See the requirements.txt file for an exhaustive list of all of the +# See the envs/requirements.txt file for an exhaustive list of all the # packages installed in the environment and their versions used in # recent development. diff --git a/SalishSeaTools/requirements.txt b/SalishSeaTools/envs/requirements.txt similarity index 96% rename from SalishSeaTools/requirements.txt rename to SalishSeaTools/envs/requirements.txt index 1e1d83fa..b4b55c2a 100644 --- a/SalishSeaTools/requirements.txt +++ b/SalishSeaTools/envs/requirements.txt @@ -1,11 +1,11 @@ # Python packages and version used in development environment # # This list is intended to be for reference only. -# Use the conda environment description file (environment.yaml) +# Use the conda environment description file (envs/environment-dev.yaml) # to create an isolated development environment. # # Create/update this file with: -# (salishsea-tools)$ python -m pip list --format=freeze >> SalishSeaTools/requirements.txt +# (salishsea-tools)$ python -m pip list --format=freeze >> SalishSeaTools/envs/requirements.txt alabaster==1.0.0 angles==2.0 diff --git a/SalishSeaTools/setup.py b/SalishSeaTools/setup.py index aa3d8a66..ed92853a 100644 --- a/SalishSeaTools/setup.py +++ b/SalishSeaTools/setup.py @@ -42,7 +42,7 @@ except IOError: long_description = '' install_requires = [ - # see requirements.txt for versions most recently used in development + # see envs/requirements.txt for versions most recently used in development 'angles', 'arrow>=1.0.0', 'bottleneck',