From 5bb91a83c35d547b3093a2f9832dd33f8bdac44b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Rodr=C3=ADguez-Guerra?= Date: Thu, 6 May 2021 09:42:12 +0200 Subject: [PATCH] sort out binder + environment.yml symlink to avoid env file copies --- .binder/environment.yml | 1 + .github/workflows/docs.yml | 2 +- devtools/{conda-envs => other-conda-envs}/users_env.yml | 0 devtools/{conda-envs => }/test_env.yml | 6 +++--- docs/installing.rst | 2 +- environment.yml | 1 - 6 files changed, 6 insertions(+), 6 deletions(-) create mode 120000 .binder/environment.yml rename devtools/{conda-envs => other-conda-envs}/users_env.yml (100%) rename devtools/{conda-envs => }/test_env.yml (92%) delete mode 120000 environment.yml diff --git a/.binder/environment.yml b/.binder/environment.yml new file mode 120000 index 00000000..030831ad --- /dev/null +++ b/.binder/environment.yml @@ -0,0 +1 @@ +../devtools/test_env.yml \ No newline at end of file diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d9b58594..e7d3a399 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,7 @@ jobs: python-version: "3.7" activate-environment: teachopencadd channel-priority: true - environment-file: devtools/conda-envs/test_env.yml + environment-file: devtools/test_env.yml auto-activate-base: false - name: Additional info about the build diff --git a/devtools/conda-envs/users_env.yml b/devtools/other-conda-envs/users_env.yml similarity index 100% rename from devtools/conda-envs/users_env.yml rename to devtools/other-conda-envs/users_env.yml diff --git a/devtools/conda-envs/test_env.yml b/devtools/test_env.yml similarity index 92% rename from devtools/conda-envs/test_env.yml rename to devtools/test_env.yml index 4c89b6c1..fce7eb56 100644 --- a/devtools/conda-envs/test_env.yml +++ b/devtools/test_env.yml @@ -1,4 +1,4 @@ -name: teachopencadd +name: teachopencadd channels: - conda-forge dependencies: @@ -49,5 +49,5 @@ dependencies: - nbsphinx-link - https://github.com/jaimergp/autodocktools-prepare-py3k/archive/master.zip - https://github.com/volkamerlab/opencadd/archive/b6d9c511f89ff200c45532e614f1abffa35e2ab7.zip - # the package itself (teachopencadd) - - ../../ + # TeachOpenCADD itself + - ../ \ No newline at end of file diff --git a/docs/installing.rst b/docs/installing.rst index 96e4a391..322eff46 100644 --- a/docs/installing.rst +++ b/docs/installing.rst @@ -13,7 +13,7 @@ Eventually, we will have a ``conda`` package, but for now you need to create a n 1. Create a new conda environment for TeachOpenCADD:: - conda env create -f https://raw.githubusercontent.com/volkamerlab/TeachOpenCADD/master/environment.yml + conda env create -f https://raw.githubusercontent.com/volkamerlab/TeachOpenCADD/master/devtools/other-conda-envs/users_env.yml 2. Activate the new environment:: diff --git a/environment.yml b/environment.yml deleted file mode 120000 index 0760edf1..00000000 --- a/environment.yml +++ /dev/null @@ -1 +0,0 @@ -devtools/conda-envs/test_env.yml \ No newline at end of file