From 032a1c7b3e06e0fe1faa93100171a5f437418dac Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Wed, 1 Sep 2021 16:19:42 +0100 Subject: [PATCH 01/27] conda builds --- .github/workflows/conda-build-test.yml | 16 +++ .../environments/basic.yml | 133 ++++++++++++++++++ 2 files changed, 149 insertions(+) create mode 100644 .github/workflows/conda-build-test.yml create mode 100644 src/administration-guide/environments/basic.yml diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml new file mode 100644 index 0000000000..3354de08fb --- /dev/null +++ b/.github/workflows/conda-build-test.yml @@ -0,0 +1,16 @@ +name: test + +on: + push: + branches: [master] + pull_request: + workflow_dispatch: + +jobs: + test: + runs-on: ubuntu-18.04 + timeout-minutes: 10 + steps: + - name: conda install + run: + conda env create -f tests \ No newline at end of file diff --git a/src/administration-guide/environments/basic.yml b/src/administration-guide/environments/basic.yml new file mode 100644 index 0000000000..b067d58b20 --- /dev/null +++ b/src/administration-guide/environments/basic.yml @@ -0,0 +1,133 @@ +name: cylc-8-basic +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - aiofiles=0.5.0=py37_0 + - alembic=1.6.4=pyhd3eb1b0_0 + - aniso8601=7.0.0=py_0 + - ansimarkup=1.5.0=pyh44b312d_0 + - asn1crypto=1.4.0=py_0 + - async_generator=1.10=py37h28b3542_0 + - attrs=21.2.0=pyhd3eb1b0_0 + - blas=1.0=mkl + - blinker=1.4=py37h06a4308_0 + - brotli=1.0.9=he6710b0_2 + - brotlipy=0.7.0=py37h27cfd23_1003 + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py37h06a4308_0 + - certipy=0.1.3=py_0 + - cffi=1.14.0=py37h2e261b9_0 + - charset-normalizer=2.0.4=pyhd3eb1b0_0 + - click=8.0.1=pyhd3eb1b0_0 + - colorama=0.4.4=pyhd3eb1b0_0 + - configurable-http-proxy=4.2.3=node12_hac6e442_0 + - cryptography=2.3.1=py37hc365091_0 + - cycler=0.10.0=py37_0 + - cylc=8.0b1=py37h89c1867_0 + - cylc-flow=8.0b1=py37h89c1867_0 + - cylc-uiserver=0.4.0=py37h89c1867_0 + - empy=3.3.4=pyh9f0ad1d_1 + - entrypoints=0.3=py37_0 + - fonttools=4.25.0=pyhd3eb1b0_0 + - freetype=2.10.4=h5ab3b9f_0 + - graphene=2.1.9=pyhd8ed1ab_0 + - graphene-tornado=2.6.1=py_0 + - graphql-core=2.3.2=pyh9f0ad1d_0 + - graphql-relay=2.0.1=py_0 + - graphql-ws=0.3.1=pyh9f0ad1d_1 + - greenlet=1.1.1=py37h295c915_0 + - idna=3.2=pyhd3eb1b0_0 + - importlib-metadata=3.10.0=py37h06a4308_0 + - importlib_metadata=3.10.0=hd3eb1b0_0 + - intel-openmp=2021.3.0=h06a4308_3350 + - ipython_genutils=0.2.0=pyhd3eb1b0_1 + - jinja2=2.11.0=py_0 + - jpeg=9b=h024ee3a_2 + - jsonschema=3.2.0=py_2 + - jupyter_telemetry=0.1.0=py_0 + - jupyterhub=1.3.0=py37h06a4308_1 + - jupyterhub-base=1.3.0=py37h06a4308_1 + - kiwisolver=1.3.1=py37h2531618_0 + - lcms2=2.12=h3be6417_0 + - libcurl=7.61.1=heec0ca6_0 + - libedit=3.1.20210714=h7f8727e_0 + - libffi=3.2.1=hf484d3e_1007 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libpng=1.6.37=hbc83047_0 + - libprotobuf=3.15.8=h780b84a_0 + - libsodium=1.0.18=h7b6447c_0 + - libssh2=1.8.0=h9cfc8f7_4 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - libtiff=4.2.0=h85742a9_0 + - libwebp-base=1.2.0=h27cfd23_0 + - lz4-c=1.9.3=h295c915_1 + - mako=1.1.4=pyhd3eb1b0_0 + - markupsafe=2.0.1=py37h27cfd23_0 + - matplotlib-base=3.4.2=py37hab158f2_0 + - metomi-isodatetime=1!2.0.2=py_0 + - mkl=2021.3.0=h06a4308_520 + - mkl-service=2.4.0=py37h7f8727e_0 + - mkl_fft=1.3.0=py37h42c9631_2 + - mkl_random=1.2.2=py37h51133e4_0 + - munkres=1.1.4=py_0 + - ncurses=6.2=he6710b0_1 + - nodejs=12.4.0=he1b5a44_0 + - numpy=1.20.3=py37hf144106_0 + - numpy-base=1.20.3=py37h74d4b33_0 + - oauthlib=3.1.0=py_0 + - olefile=0.46=py37_0 + - openjpeg=2.4.0=h3ad879b_0 + - openssl=1.0.2u=h7b6447c_0 + - packaging=21.0=pyhd3eb1b0_0 + - pamela=1.0.0=py_0 + - pandas=0.25.3=py37he6710b0_0 + - pillow=8.3.1=py37h2c7a002_0 + - pip=21.2.2=py37h06a4308_0 + - prometheus_client=0.11.0=pyhd3eb1b0_0 + - promise=2.3=py37h06a4308_0 + - protobuf=3.15.8=py37hcd2ae1e_0 + - psutil=5.8.0=py37h27cfd23_1 + - pyasn1=0.4.8=py_0 + - pycparser=2.20=py_2 + - pycurl=7.43.0.2=py37hb7f436b_0 + - pyjwt=1.7.1=py37_0 + - pympler=0.9=py_0 + - pyopenssl=19.0.0=py37_0 + - pyparsing=2.4.7=pyhd3eb1b0_0 + - pyrsistent=0.17.3=py37h7b6447c_0 + - pysocks=1.7.1=py37_1 + - python=3.7.0=h6e4f718_3 + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python-editor=1.0.4=py_0 + - python-json-logger=2.0.1=py_0 + - python_abi=3.7=2_cp37m + - pytz=2021.1=pyhd3eb1b0_0 + - pyuv=1.4.0=py37h5e8e339_1003 + - pyzmq=19.0.2=py37he6710b0_1 + - readline=7.0=h7b6447c_5 + - requests=2.26.0=pyhd3eb1b0_0 + - ruamel.yaml=0.16.12=py37h7b6447c_1 + - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 + - rx=1.6.1=py_0 + - setuptools=52.0.0=py37h06a4308_0 + - six=1.16.0=pyhd3eb1b0_0 + - sqlalchemy=1.4.22=py37h7f8727e_0 + - sqlite=3.33.0=h62c20be_0 + - tk=8.6.10=hbc83047_0 + - tornado=6.1=py37h27cfd23_0 + - traitlets=5.0.5=pyhd3eb1b0_0 + - typing_extensions=3.10.0.0=pyh06a4308_0 + - urllib3=1.26.6=pyhd3eb1b0_1 + - urwid=2.0.1=py37h516909a_1000 + - werkzeug=0.12.2=py_1 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zeromq=4.3.4=h2531618_0 + - zipp=3.5.0=pyhd3eb1b0_0 + - zlib=1.2.11=h7b6447c_3 + - zstd=1.4.9=haebb681_0 From 8a904a57741dbcc198cf93f0bc11270f5d096ac8 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Wed, 1 Sep 2021 16:19:42 +0100 Subject: [PATCH 02/27] conda builds --- .github/workflows/conda-build-test.yml | 23 +++ src/admin-guide/environments/basic.yml | 134 +++++++++++++++++ src/admin-guide/environments/example_envs.rst | 45 ++++++ src/admin-guide/environments/gui.yml | 137 +++++++++++++++++ src/admin-guide/environments/live-basic.yml | 30 ++++ src/admin-guide/environments/live-full.yml | 35 +++++ src/admin-guide/environments/rose.yml | 138 ++++++++++++++++++ src/admin-guide/index.rst | 8 + src/index.rst | 1 + 9 files changed, 551 insertions(+) create mode 100644 .github/workflows/conda-build-test.yml create mode 100644 src/admin-guide/environments/basic.yml create mode 100644 src/admin-guide/environments/example_envs.rst create mode 100644 src/admin-guide/environments/gui.yml create mode 100644 src/admin-guide/environments/live-basic.yml create mode 100644 src/admin-guide/environments/live-full.yml create mode 100644 src/admin-guide/environments/rose.yml create mode 100644 src/admin-guide/index.rst diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml new file mode 100644 index 0000000000..abd42d32e1 --- /dev/null +++ b/.github/workflows/conda-build-test.yml @@ -0,0 +1,23 @@ +name: conda builds + +on: + push: + branches: [master] + pull_request: + workflow_dispatch: + +jobs: + test_conda_install: + runs-on: ubuntu-18.04 + timeout-minutes: 10 + strategy: + matrix: + case: [basic, gui, rose, live-basic, live-full] + steps: + - name: checkout cylc-doc + uses: actions/checkout@v2 + + - name: build conda env ${{matrix.case}} + run: | + conda env create -f \ + src/admin-guide/environments/${{matrix.case}}.yml diff --git a/src/admin-guide/environments/basic.yml b/src/admin-guide/environments/basic.yml new file mode 100644 index 0000000000..9f856ffc3e --- /dev/null +++ b/src/admin-guide/environments/basic.yml @@ -0,0 +1,134 @@ +name: cylc-8-basic +# Cylc 8 without GUI installed from Conda Repos. +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - aiofiles=0.5.0=py37_0 + - alembic=1.6.4=pyhd3eb1b0_0 + - aniso8601=7.0.0=py_0 + - ansimarkup=1.5.0=pyh44b312d_0 + - asn1crypto=1.4.0=py_0 + - async_generator=1.10=py37h28b3542_0 + - attrs=21.2.0=pyhd3eb1b0_0 + - blas=1.0=mkl + - blinker=1.4=py37h06a4308_0 + - brotli=1.0.9=he6710b0_2 + - brotlipy=0.7.0=py37h27cfd23_1003 + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py37h06a4308_0 + - certipy=0.1.3=py_0 + - cffi=1.14.0=py37h2e261b9_0 + - charset-normalizer=2.0.4=pyhd3eb1b0_0 + - click=8.0.1=pyhd3eb1b0_0 + - colorama=0.4.4=pyhd3eb1b0_0 + - configurable-http-proxy=4.2.3=node12_hac6e442_0 + - cryptography=2.3.1=py37hc365091_0 + - cycler=0.10.0=py37_0 + - cylc=8.0b1=py37h89c1867_0 + - cylc-flow=8.0b1=py37h89c1867_0 + - cylc-uiserver=0.4.0=py37h89c1867_0 + - empy=3.3.4=pyh9f0ad1d_1 + - entrypoints=0.3=py37_0 + - fonttools=4.25.0=pyhd3eb1b0_0 + - freetype=2.10.4=h5ab3b9f_0 + - graphene=2.1.9=pyhd8ed1ab_0 + - graphene-tornado=2.6.1=py_0 + - graphql-core=2.3.2=pyh9f0ad1d_0 + - graphql-relay=2.0.1=py_0 + - graphql-ws=0.3.1=pyh9f0ad1d_1 + - greenlet=1.1.1=py37h295c915_0 + - idna=3.2=pyhd3eb1b0_0 + - importlib-metadata=3.10.0=py37h06a4308_0 + - importlib_metadata=3.10.0=hd3eb1b0_0 + - intel-openmp=2021.3.0=h06a4308_3350 + - ipython_genutils=0.2.0=pyhd3eb1b0_1 + - jinja2=2.11.0=py_0 + - jpeg=9b=h024ee3a_2 + - jsonschema=3.2.0=py_2 + - jupyter_telemetry=0.1.0=py_0 + - jupyterhub=1.3.0=py37h06a4308_1 + - jupyterhub-base=1.3.0=py37h06a4308_1 + - kiwisolver=1.3.1=py37h2531618_0 + - lcms2=2.12=h3be6417_0 + - libcurl=7.61.1=heec0ca6_0 + - libedit=3.1.20210714=h7f8727e_0 + - libffi=3.2.1=hf484d3e_1007 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libpng=1.6.37=hbc83047_0 + - libprotobuf=3.15.8=h780b84a_0 + - libsodium=1.0.18=h7b6447c_0 + - libssh2=1.8.0=h9cfc8f7_4 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - libtiff=4.2.0=h85742a9_0 + - libwebp-base=1.2.0=h27cfd23_0 + - lz4-c=1.9.3=h295c915_1 + - mako=1.1.4=pyhd3eb1b0_0 + - markupsafe=2.0.1=py37h27cfd23_0 + - matplotlib-base=3.4.2=py37hab158f2_0 + - metomi-isodatetime=1!2.0.2=py_0 + - mkl=2021.3.0=h06a4308_520 + - mkl-service=2.4.0=py37h7f8727e_0 + - mkl_fft=1.3.0=py37h42c9631_2 + - mkl_random=1.2.2=py37h51133e4_0 + - munkres=1.1.4=py_0 + - ncurses=6.2=he6710b0_1 + - nodejs=12.4.0=he1b5a44_0 + - numpy=1.20.3=py37hf144106_0 + - numpy-base=1.20.3=py37h74d4b33_0 + - oauthlib=3.1.0=py_0 + - olefile=0.46=py37_0 + - openjpeg=2.4.0=h3ad879b_0 + - openssl=1.0.2u=h7b6447c_0 + - packaging=21.0=pyhd3eb1b0_0 + - pamela=1.0.0=py_0 + - pandas=0.25.3=py37he6710b0_0 + - pillow=8.3.1=py37h2c7a002_0 + - pip=21.2.2=py37h06a4308_0 + - prometheus_client=0.11.0=pyhd3eb1b0_0 + - promise=2.3=py37h06a4308_0 + - protobuf=3.15.8=py37hcd2ae1e_0 + - psutil=5.8.0=py37h27cfd23_1 + - pyasn1=0.4.8=py_0 + - pycparser=2.20=py_2 + - pycurl=7.43.0.2=py37hb7f436b_0 + - pyjwt=1.7.1=py37_0 + - pympler=0.9=py_0 + - pyopenssl=19.0.0=py37_0 + - pyparsing=2.4.7=pyhd3eb1b0_0 + - pyrsistent=0.17.3=py37h7b6447c_0 + - pysocks=1.7.1=py37_1 + - python=3.7.0=h6e4f718_3 + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python-editor=1.0.4=py_0 + - python-json-logger=2.0.1=py_0 + - python_abi=3.7=2_cp37m + - pytz=2021.1=pyhd3eb1b0_0 + - pyuv=1.4.0=py37h5e8e339_1003 + - pyzmq=19.0.2=py37he6710b0_1 + - readline=7.0=h7b6447c_5 + - requests=2.26.0=pyhd3eb1b0_0 + - ruamel.yaml=0.16.12=py37h7b6447c_1 + - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 + - rx=1.6.1=py_0 + - setuptools=52.0.0=py37h06a4308_0 + - six=1.16.0=pyhd3eb1b0_0 + - sqlalchemy=1.4.22=py37h7f8727e_0 + - sqlite=3.33.0=h62c20be_0 + - tk=8.6.10=hbc83047_0 + - tornado=6.1=py37h27cfd23_0 + - traitlets=5.0.5=pyhd3eb1b0_0 + - typing_extensions=3.10.0.0=pyh06a4308_0 + - urllib3=1.26.6=pyhd3eb1b0_1 + - urwid=2.0.1=py37h516909a_1000 + - werkzeug=0.12.2=py_1 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zeromq=4.3.4=h2531618_0 + - zipp=3.5.0=pyhd3eb1b0_0 + - zlib=1.2.11=h7b6447c_3 + - zstd=1.4.9=haebb681_0 diff --git a/src/admin-guide/environments/example_envs.rst b/src/admin-guide/environments/example_envs.rst new file mode 100644 index 0000000000..4478ca49c3 --- /dev/null +++ b/src/admin-guide/environments/example_envs.rst @@ -0,0 +1,45 @@ +Example Environments +==================== + +A set of possible installations of Cylc: + +.. csv-table:: + :header-rows:1 + + environment, cylc, cylc uiserver, rose, install latest from github + `Cylc 8 basic`_, ✔️, , , + `Cylc 8 with UI Server`_, ✔️,✔️, , + `Cylc 8 with Rose`_, ✔️,✔️,✔️, + `Cylc 8 basic live from github`_, ✔️, , ,✔️ + `Cylc 8 with rose and GUI live from github`_,✔️,✔️,✔️,✔️ + + +Cylc 8 basic +------------ + +.. literalinclude:: basic.yml + :language: YAML + +Cylc 8 with UI Server +--------------------- + +.. literalinclude:: gui.yml + :language: YAML + +Cylc 8 with Rose +---------------- + +.. literalinclude:: rose.yml + :language: YAML + +Cylc 8 basic live from github +----------------------------- + +.. literalinclude:: live-basic.yml + :language: YAML + +Cylc 8 with rose and GUI live from github +----------------------------------------- + +.. literalinclude:: live-full.yml + :language: YAML diff --git a/src/admin-guide/environments/gui.yml b/src/admin-guide/environments/gui.yml new file mode 100644 index 0000000000..c9c1873a78 --- /dev/null +++ b/src/admin-guide/environments/gui.yml @@ -0,0 +1,137 @@ +name: cylc-8-with-gui +# Cylc 8 and the UI server installed from Conda +# n.b. The UI needs to be installed with Yarn: For details see +# https://github.com/cylc/cylc-ui +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - aiofiles=0.5.0=py37_0 + - alembic=1.6.4=pyhd3eb1b0_0 + - aniso8601=7.0.0=py_0 + - ansimarkup=1.5.0=pyh44b312d_0 + - asn1crypto=1.4.0=py_0 + - async_generator=1.10=py37h28b3542_0 + - attrs=21.2.0=pyhd3eb1b0_0 + - blas=1.0=mkl + - blinker=1.4=py37h06a4308_0 + - brotli=1.0.9=he6710b0_2 + - brotlipy=0.7.0=py37h27cfd23_1003 + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py37h06a4308_0 + - certipy=0.1.3=py_0 + - cffi=1.14.0=py37h2e261b9_0 + - charset-normalizer=2.0.4=pyhd3eb1b0_0 + - click=8.0.1=pyhd3eb1b0_0 + - colorama=0.4.4=pyhd3eb1b0_0 + - configurable-http-proxy=4.2.3=node12_hac6e442_0 + - cryptography=2.3.1=py37hc365091_0 + - cycler=0.10.0=py37_0 + - cylc=8.0b1=py37h89c1867_0 + - cylc-flow=8.0b1=py37h89c1867_0 + - cylc-ui=0.5.0=ha770c72_0 + - cylc-uiserver=0.4.0=py37h89c1867_0 + - empy=3.3.4=pyh9f0ad1d_1 + - entrypoints=0.3=py37_0 + - fonttools=4.25.0=pyhd3eb1b0_0 + - freetype=2.10.4=h5ab3b9f_0 + - graphene=2.1.9=pyhd8ed1ab_0 + - graphene-tornado=2.6.1=py_0 + - graphql-core=2.3.2=pyh9f0ad1d_0 + - graphql-relay=2.0.1=py_0 + - graphql-ws=0.3.1=pyh9f0ad1d_1 + - greenlet=1.1.1=py37h295c915_0 + - idna=3.2=pyhd3eb1b0_0 + - importlib-metadata=3.10.0=py37h06a4308_0 + - importlib_metadata=3.10.0=hd3eb1b0_0 + - intel-openmp=2021.3.0=h06a4308_3350 + - ipython_genutils=0.2.0=pyhd3eb1b0_1 + - jinja2=2.11.0=py_0 + - jpeg=9b=h024ee3a_2 + - jsonschema=3.2.0=py_2 + - jupyter_telemetry=0.1.0=py_0 + - jupyterhub=1.3.0=py37h06a4308_1 + - jupyterhub-base=1.3.0=py37h06a4308_1 + - kiwisolver=1.3.1=py37h2531618_0 + - lcms2=2.12=h3be6417_0 + - libcurl=7.61.1=heec0ca6_0 + - libedit=3.1.20210714=h7f8727e_0 + - libffi=3.2.1=hf484d3e_1007 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libpng=1.6.37=hbc83047_0 + - libprotobuf=3.15.8=h780b84a_0 + - libsodium=1.0.18=h7b6447c_0 + - libssh2=1.8.0=h9cfc8f7_4 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - libtiff=4.2.0=h85742a9_0 + - libwebp-base=1.2.0=h27cfd23_0 + - lz4-c=1.9.3=h295c915_1 + - mako=1.1.4=pyhd3eb1b0_0 + - markupsafe=2.0.1=py37h27cfd23_0 + - matplotlib-base=3.4.2=py37hab158f2_0 + - metomi-isodatetime=1!2.0.2=py_0 + - mkl=2021.3.0=h06a4308_520 + - mkl-service=2.4.0=py37h7f8727e_0 + - mkl_fft=1.3.0=py37h42c9631_2 + - mkl_random=1.2.2=py37h51133e4_0 + - munkres=1.1.4=py_0 + - ncurses=6.2=he6710b0_1 + - nodejs=12.4.0=he1b5a44_0 + - numpy=1.20.3=py37hf144106_0 + - numpy-base=1.20.3=py37h74d4b33_0 + - oauthlib=3.1.0=py_0 + - olefile=0.46=py37_0 + - openjpeg=2.4.0=h3ad879b_0 + - openssl=1.0.2u=h7b6447c_0 + - packaging=21.0=pyhd3eb1b0_0 + - pamela=1.0.0=py_0 + - pandas=0.25.3=py37he6710b0_0 + - pillow=8.3.1=py37h2c7a002_0 + - pip=21.2.2=py37h06a4308_0 + - prometheus_client=0.11.0=pyhd3eb1b0_0 + - promise=2.3=py37h06a4308_0 + - protobuf=3.15.8=py37hcd2ae1e_0 + - psutil=5.8.0=py37h27cfd23_1 + - pyasn1=0.4.8=py_0 + - pycparser=2.20=py_2 + - pycurl=7.43.0.2=py37hb7f436b_0 + - pyjwt=1.7.1=py37_0 + - pympler=0.9=py_0 + - pyopenssl=19.0.0=py37_0 + - pyparsing=2.4.7=pyhd3eb1b0_0 + - pyrsistent=0.17.3=py37h7b6447c_0 + - pysocks=1.7.1=py37_1 + - python=3.7.0=h6e4f718_3 + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python-editor=1.0.4=py_0 + - python-json-logger=2.0.1=py_0 + - python_abi=3.7=2_cp37m + - pytz=2021.1=pyhd3eb1b0_0 + - pyuv=1.4.0=py37h5e8e339_1003 + - pyzmq=19.0.2=py37he6710b0_1 + - readline=7.0=h7b6447c_5 + - requests=2.26.0=pyhd3eb1b0_0 + - ruamel.yaml=0.16.12=py37h7b6447c_1 + - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 + - rx=1.6.1=py_0 + - setuptools=52.0.0=py37h06a4308_0 + - six=1.16.0=pyhd3eb1b0_0 + - sqlalchemy=1.4.22=py37h7f8727e_0 + - sqlite=3.33.0=h62c20be_0 + - tk=8.6.10=hbc83047_0 + - tornado=6.1=py37h27cfd23_0 + - traitlets=5.0.5=pyhd3eb1b0_0 + - typing_extensions=3.10.0.0=pyh06a4308_0 + - urllib3=1.26.6=pyhd3eb1b0_1 + - urwid=2.0.1=py37h516909a_1000 + - werkzeug=0.12.2=py_1 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zeromq=4.3.4=h2531618_0 + - zipp=3.5.0=pyhd3eb1b0_0 + - zlib=1.2.11=h7b6447c_3 + - zstd=1.4.9=haebb681_0 diff --git a/src/admin-guide/environments/live-basic.yml b/src/admin-guide/environments/live-basic.yml new file mode 100644 index 0000000000..3470626a69 --- /dev/null +++ b/src/admin-guide/environments/live-basic.yml @@ -0,0 +1,30 @@ +name: cylc-8-basic +# Cylc 8 without GUI installed from the default GitHub branch. +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py39h06a4308_0 + - ld_impl_linux-64=2.35.1=h7274673_9 + - libffi=3.3=he6710b0_2 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - ncurses=6.2=he6710b0_1 + - openssl=1.1.1k=h27cfd23_0 + - pip=21.2.4=py37h06a4308_0 + - python=3.9.6=h12debd9_1 + - readline=8.1=h27cfd23_0 + - setuptools=52.0.0=py39h06a4308_0 + - sqlite=3.36.0=hc218d9a_0 + - tk=8.6.10=hbc83047_0 + - tzdata=2021a=h5d7bf9c_0 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zlib=1.2.11=h7b6447c_3 + - pip: + - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/live-full.yml b/src/admin-guide/environments/live-full.yml new file mode 100644 index 0000000000..5f199b963b --- /dev/null +++ b/src/admin-guide/environments/live-full.yml @@ -0,0 +1,35 @@ +name: cylc-8-live-with-rose +# Cylc 8, the UI server, Cylc Rose and Metomi Rose +# n.b. The UI needs to be installed with Yarn: For details see +# https://github.com/cylc/cylc-ui +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py39h06a4308_0 + - ld_impl_linux-64=2.35.1=h7274673_9 + - libffi=3.3=he6710b0_2 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - ncurses=6.2=he6710b0_1 + - openssl=1.1.1k=h27cfd23_0 + - pip=21.2.4=py37h06a4308_0 + - python=3.9.6=h12debd9_1 + - readline=8.1=h27cfd23_0 + - setuptools=52.0.0=py39h06a4308_0 + - sqlite=3.36.0=hc218d9a_0 + - tk=8.6.10=hbc83047_0 + - tzdata=2021a=h5d7bf9c_0 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zlib=1.2.11=h7b6447c_3 + - pip: + - git+https://github.com/cylc/cylc-flow.git + - git+https://github.com/cylc/cylc-uiserver.git + - git+https://github.com/metomi/rose.git + - git+https://github.com/cylc/cylc-rose.git diff --git a/src/admin-guide/environments/rose.yml b/src/admin-guide/environments/rose.yml new file mode 100644 index 0000000000..adb97aeaa3 --- /dev/null +++ b/src/admin-guide/environments/rose.yml @@ -0,0 +1,138 @@ +name: cylc-8-with-rose +# Cylc 8, the UI server, Cylc Rose and Metomi Rose +channels: + - defaults + - conda-forge + - kinow +dependencies: + - _libgcc_mutex=0.1=main + - _openmp_mutex=4.5=1_gnu + - aiofiles=0.5.0=py37_0 + - alembic=1.6.4=pyhd3eb1b0_0 + - aniso8601=7.0.0=py_0 + - ansimarkup=1.5.0=pyh44b312d_0 + - asn1crypto=1.4.0=py_0 + - async_generator=1.10=py37h28b3542_0 + - attrs=21.2.0=pyhd3eb1b0_0 + - blas=1.0=mkl + - blinker=1.4=py37h06a4308_0 + - brotli=1.0.9=he6710b0_2 + - brotlipy=0.7.0=py37h27cfd23_1003 + - ca-certificates=2021.7.5=h06a4308_1 + - certifi=2021.5.30=py37h06a4308_0 + - certipy=0.1.3=py_0 + - cffi=1.14.0=py37h2e261b9_0 + - charset-normalizer=2.0.4=pyhd3eb1b0_0 + - click=8.0.1=pyhd3eb1b0_0 + - colorama=0.4.4=pyhd3eb1b0_0 + - configurable-http-proxy=4.2.3=node12_hac6e442_0 + - cryptography=2.3.1=py37hc365091_0 + - cycler=0.10.0=py37_0 + - cylc=8.0b1=py37h89c1867_0 + - cylc-flow=8.0b1=py37h89c1867_0 + - cylc-rose=0.1.1=py37h89c1867_0 + - cylc-ui=0.5.0=ha770c72_0 + - cylc-uiserver=0.4.0=py37h89c1867_0 + - empy=3.3.4=pyh9f0ad1d_1 + - entrypoints=0.3=py37_0 + - fonttools=4.25.0=pyhd3eb1b0_0 + - freetype=2.10.4=h5ab3b9f_0 + - graphene=2.1.9=pyhd8ed1ab_0 + - graphene-tornado=2.6.1=py_0 + - graphql-core=2.3.2=pyh9f0ad1d_0 + - graphql-relay=2.0.1=py_0 + - graphql-ws=0.3.1=pyh9f0ad1d_1 + - greenlet=1.1.1=py37h295c915_0 + - idna=3.2=pyhd3eb1b0_0 + - importlib-metadata=3.10.0=py37h06a4308_0 + - importlib_metadata=3.10.0=hd3eb1b0_0 + - intel-openmp=2021.3.0=h06a4308_3350 + - ipython_genutils=0.2.0=pyhd3eb1b0_1 + - jinja2=2.11.0=py_0 + - jpeg=9b=h024ee3a_2 + - jsonschema=3.2.0=py_2 + - jupyter_telemetry=0.1.0=py_0 + - jupyterhub=1.3.0=py37h06a4308_1 + - jupyterhub-base=1.3.0=py37h06a4308_1 + - kiwisolver=1.3.1=py37h2531618_0 + - lcms2=2.12=h3be6417_0 + - ldap3=2.9.1=pyhd3eb1b0_0 + - libcurl=7.61.1=heec0ca6_0 + - libedit=3.1.20210714=h7f8727e_0 + - libffi=3.2.1=hf484d3e_1007 + - libgcc-ng=9.3.0=h5101ec6_17 + - libgomp=9.3.0=h5101ec6_17 + - libpng=1.6.37=hbc83047_0 + - libprotobuf=3.15.8=h780b84a_0 + - libsodium=1.0.18=h7b6447c_0 + - libssh2=1.8.0=h9cfc8f7_4 + - libstdcxx-ng=9.3.0=hd4cf53a_17 + - libtiff=4.2.0=h85742a9_0 + - libwebp-base=1.2.0=h27cfd23_0 + - lz4-c=1.9.3=h295c915_1 + - mako=1.1.4=pyhd3eb1b0_0 + - markupsafe=2.0.1=py37h27cfd23_0 + - matplotlib-base=3.4.2=py37hab158f2_0 + - metomi-isodatetime=1!2.0.2=py_0 + - metomi-rose=2.0b1=py37h5e8e339_1 + - mkl=2021.3.0=h06a4308_520 + - mkl-service=2.4.0=py37h7f8727e_0 + - mkl_fft=1.3.0=py37h42c9631_2 + - mkl_random=1.2.2=py37h51133e4_0 + - munkres=1.1.4=py_0 + - ncurses=6.2=he6710b0_1 + - nodejs=12.4.0=he1b5a44_0 + - numpy=1.20.3=py37hf144106_0 + - numpy-base=1.20.3=py37h74d4b33_0 + - oauthlib=3.1.0=py_0 + - olefile=0.46=py37_0 + - openjpeg=2.4.0=h3ad879b_0 + - openssl=1.0.2u=h7b6447c_0 + - packaging=21.0=pyhd3eb1b0_0 + - pamela=1.0.0=py_0 + - pandas=0.25.3=py37he6710b0_0 + - pillow=8.3.1=py37h2c7a002_0 + - pip=21.2.2=py37h06a4308_0 + - prometheus_client=0.11.0=pyhd3eb1b0_0 + - promise=2.3=py37h06a4308_0 + - protobuf=3.15.8=py37hcd2ae1e_0 + - psutil=5.8.0=py37h27cfd23_1 + - pyasn1=0.4.8=py_0 + - pycparser=2.20=py_2 + - pycurl=7.43.0.2=py37hb7f436b_0 + - pyjwt=1.7.1=py37_0 + - pympler=0.9=py_0 + - pyopenssl=19.0.0=py37_0 + - pyparsing=2.4.7=pyhd3eb1b0_0 + - pyrsistent=0.17.3=py37h7b6447c_0 + - pysocks=1.7.1=py37_1 + - python=3.7.0=h6e4f718_3 + - python-dateutil=2.8.2=pyhd3eb1b0_0 + - python-editor=1.0.4=py_0 + - python-json-logger=2.0.1=py_0 + - python_abi=3.7=2_cp37m + - pytz=2021.1=pyhd3eb1b0_0 + - pyuv=1.4.0=py37h5e8e339_1003 + - pyzmq=19.0.2=py37he6710b0_1 + - readline=7.0=h7b6447c_5 + - requests=2.26.0=pyhd3eb1b0_0 + - ruamel.yaml=0.16.12=py37h7b6447c_1 + - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 + - rx=1.6.1=py_0 + - setuptools=52.0.0=py37h06a4308_0 + - six=1.16.0=pyhd3eb1b0_0 + - sqlalchemy=1.4.22=py37h7f8727e_0 + - sqlite=3.33.0=h62c20be_0 + - tk=8.6.10=hbc83047_0 + - tornado=6.1=py37h27cfd23_0 + - traitlets=5.0.5=pyhd3eb1b0_0 + - typing_extensions=3.10.0.0=pyh06a4308_0 + - urllib3=1.26.6=pyhd3eb1b0_1 + - urwid=2.0.1=py37h516909a_1000 + - werkzeug=0.12.2=py_1 + - wheel=0.37.0=pyhd3eb1b0_0 + - xz=5.2.5=h7b6447c_0 + - zeromq=4.3.4=h2531618_0 + - zipp=3.5.0=pyhd3eb1b0_0 + - zlib=1.2.11=h7b6447c_3 + - zstd=1.4.9=haebb681_0 diff --git a/src/admin-guide/index.rst b/src/admin-guide/index.rst new file mode 100644 index 0000000000..460b8adaf8 --- /dev/null +++ b/src/admin-guide/index.rst @@ -0,0 +1,8 @@ +Administration Guide +==================== + + +.. toctree:: + :maxdepth: 2 + + environments/example_envs.rst \ No newline at end of file diff --git a/src/index.rst b/src/index.rst index 76052cc54a..20dec08831 100644 --- a/src/index.rst +++ b/src/index.rst @@ -26,4 +26,5 @@ indefinitely. plugins/index workflow-design-guide/index reference/index + administration-guide/index glossary From af98ea7e0e1ac6814991bd6412b2f7fabd3bf5bd Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 08:46:17 +0100 Subject: [PATCH 03/27] Update src/index.rst --- src/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.rst b/src/index.rst index 20dec08831..b448e14e3b 100644 --- a/src/index.rst +++ b/src/index.rst @@ -26,5 +26,5 @@ indefinitely. plugins/index workflow-design-guide/index reference/index - administration-guide/index + admin-guide/index glossary From 1b0c61c94b425b6323df66c533863912f00206ca Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:33:23 +0100 Subject: [PATCH 04/27] Apply suggestions from code review Co-authored-by: Oliver Sanders --- src/admin-guide/environments/basic.yml | 2 -- src/admin-guide/environments/gui.yml | 2 -- src/admin-guide/environments/live-full.yml | 23 ++-------------------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/admin-guide/environments/basic.yml b/src/admin-guide/environments/basic.yml index 9f856ffc3e..ee1030a6c3 100644 --- a/src/admin-guide/environments/basic.yml +++ b/src/admin-guide/environments/basic.yml @@ -1,9 +1,7 @@ name: cylc-8-basic # Cylc 8 without GUI installed from Conda Repos. channels: - - defaults - conda-forge - - kinow dependencies: - _libgcc_mutex=0.1=main - _openmp_mutex=4.5=1_gnu diff --git a/src/admin-guide/environments/gui.yml b/src/admin-guide/environments/gui.yml index c9c1873a78..7adfb65c4d 100644 --- a/src/admin-guide/environments/gui.yml +++ b/src/admin-guide/environments/gui.yml @@ -1,7 +1,5 @@ name: cylc-8-with-gui # Cylc 8 and the UI server installed from Conda -# n.b. The UI needs to be installed with Yarn: For details see -# https://github.com/cylc/cylc-ui channels: - defaults - conda-forge diff --git a/src/admin-guide/environments/live-full.yml b/src/admin-guide/environments/live-full.yml index 5f199b963b..f02ee0d918 100644 --- a/src/admin-guide/environments/live-full.yml +++ b/src/admin-guide/environments/live-full.yml @@ -7,27 +7,8 @@ channels: - conda-forge - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py39h06a4308_0 - - ld_impl_linux-64=2.35.1=h7274673_9 - - libffi=3.3=he6710b0_2 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - ncurses=6.2=he6710b0_1 - - openssl=1.1.1k=h27cfd23_0 - - pip=21.2.4=py37h06a4308_0 - - python=3.9.6=h12debd9_1 - - readline=8.1=h27cfd23_0 - - setuptools=52.0.0=py39h06a4308_0 - - sqlite=3.36.0=hc218d9a_0 - - tk=8.6.10=hbc83047_0 - - tzdata=2021a=h5d7bf9c_0 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zlib=1.2.11=h7b6447c_3 + - python + - pip - pip: - git+https://github.com/cylc/cylc-flow.git - git+https://github.com/cylc/cylc-uiserver.git From 9ad666e2424541703bcb1430c403d915a363392b Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:47:51 +0100 Subject: [PATCH 05/27] slimmed basic.yml right down. --- src/admin-guide/environments/basic.yml | 129 +------------------------ 1 file changed, 2 insertions(+), 127 deletions(-) diff --git a/src/admin-guide/environments/basic.yml b/src/admin-guide/environments/basic.yml index ee1030a6c3..6dc11d0b0f 100644 --- a/src/admin-guide/environments/basic.yml +++ b/src/admin-guide/environments/basic.yml @@ -3,130 +3,5 @@ name: cylc-8-basic channels: - conda-forge dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 + - cylc-flow=8.* + - pip From f11c6a5811335bb0ba7550bab9c5776ae6f3c304 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:59:42 +0100 Subject: [PATCH 06/27] add python versions to basic example --- .github/workflows/conda-build-test.yml | 10 ++++++++-- .../environments/{basic.yml => basic-3.7.yml} | 1 + src/admin-guide/environments/basic-3.8.yml | 8 ++++++++ src/admin-guide/environments/basic-3.9.yml | 8 ++++++++ 4 files changed, 25 insertions(+), 2 deletions(-) rename src/admin-guide/environments/{basic.yml => basic-3.7.yml} (89%) create mode 100644 src/admin-guide/environments/basic-3.8.yml create mode 100644 src/admin-guide/environments/basic-3.9.yml diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index abd42d32e1..fab16c53ac 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -13,11 +13,17 @@ jobs: strategy: matrix: case: [basic, gui, rose, live-basic, live-full] + python: [3.7, 3.8, 3.9] steps: - name: checkout cylc-doc uses: actions/checkout@v2 - name: build conda env ${{matrix.case}} run: | - conda env create -f \ - src/admin-guide/environments/${{matrix.case}}.yml + if [[ -f src/admin-guide/environments/${{matrix.case}}-${{python}}.yml ]]; then + conda env create -f \ + src/admin-guide/environments/${{matrix.case}}-${{python}}.yml + else + conda env create -f \ + src/admin-guide/environments/${{matrix.case}}.yml + fi diff --git a/src/admin-guide/environments/basic.yml b/src/admin-guide/environments/basic-3.7.yml similarity index 89% rename from src/admin-guide/environments/basic.yml rename to src/admin-guide/environments/basic-3.7.yml index 6dc11d0b0f..110da4990e 100644 --- a/src/admin-guide/environments/basic.yml +++ b/src/admin-guide/environments/basic-3.7.yml @@ -3,5 +3,6 @@ name: cylc-8-basic channels: - conda-forge dependencies: + - python=3.7 - cylc-flow=8.* - pip diff --git a/src/admin-guide/environments/basic-3.8.yml b/src/admin-guide/environments/basic-3.8.yml new file mode 100644 index 0000000000..211941fbde --- /dev/null +++ b/src/admin-guide/environments/basic-3.8.yml @@ -0,0 +1,8 @@ +name: cylc-8-basic +# Cylc 8 without GUI installed from Conda Repos. +channels: + - conda-forge +dependencies: + - python=3.8 + - cylc-flow=8.* + - pip diff --git a/src/admin-guide/environments/basic-3.9.yml b/src/admin-guide/environments/basic-3.9.yml new file mode 100644 index 0000000000..6d3eadcfa2 --- /dev/null +++ b/src/admin-guide/environments/basic-3.9.yml @@ -0,0 +1,8 @@ +name: cylc-8-basic +# Cylc 8 without GUI installed from Conda Repos. +channels: + - conda-forge +dependencies: + - python=3.9 + - cylc-flow=8.* + - pip From 308baa99805a705eeab8f96ed9766e052c2f9617 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:00:59 +0100 Subject: [PATCH 07/27] correct yml file --- .github/workflows/conda-build-test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index fab16c53ac..24887df2f7 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -20,9 +20,9 @@ jobs: - name: build conda env ${{matrix.case}} run: | - if [[ -f src/admin-guide/environments/${{matrix.case}}-${{python}}.yml ]]; then + if [[ -f src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml ]]; then conda env create -f \ - src/admin-guide/environments/${{matrix.case}}-${{python}}.yml + src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml else conda env create -f \ src/admin-guide/environments/${{matrix.case}}.yml From 6824114f82a2a3053264fbc2d094d5085e8fa0a9 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:10:24 +0100 Subject: [PATCH 08/27] fixed logic of envtest.yml to only require separate env files for each python version for the basic install --- .github/workflows/conda-build-test.yml | 6 +++++- src/admin-guide/environments/example_envs.rst | 17 ++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 24887df2f7..aae6e214ab 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -20,10 +20,14 @@ jobs: - name: build conda env ${{matrix.case}} run: | + # Done like this so that we test all versions of python, + # and offer users examples of basic with all three versions + # but don't have to have three env.yml files for each case. if [[ -f src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml ]]; then conda env create -f \ src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml else conda env create -f \ - src/admin-guide/environments/${{matrix.case}}.yml + src/admin-guide/environments/${{matrix.case}}.yml \ + python==${{python}} fi diff --git a/src/admin-guide/environments/example_envs.rst b/src/admin-guide/environments/example_envs.rst index 4478ca49c3..0236c15aac 100644 --- a/src/admin-guide/environments/example_envs.rst +++ b/src/admin-guide/environments/example_envs.rst @@ -13,11 +13,26 @@ A set of possible installations of Cylc: `Cylc 8 basic live from github`_, ✔️, , ,✔️ `Cylc 8 with rose and GUI live from github`_,✔️,✔️,✔️,✔️ +Example installation command: + +.. code-block:: bash + + conda env create -f path/to/env.yml --name "name of env" Cylc 8 basic ------------ -.. literalinclude:: basic.yml +Also demonstrates using different versions of Python. + +.. literalinclude:: basic-3.7.yml + :language: YAML + + +.. literalinclude:: basic-3.8.yml + :language: YAML + + +.. literalinclude:: basic-3.9.yml :language: YAML Cylc 8 with UI Server From 723a2e10acbed045a96300c6207df796d406f964 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:11:34 +0100 Subject: [PATCH 09/27] fixed logic of envtest.yml to only require separate env files for each python version for the basic install --- src/admin-guide/environments/example_envs.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/admin-guide/environments/example_envs.rst b/src/admin-guide/environments/example_envs.rst index 0236c15aac..7d90cd07a8 100644 --- a/src/admin-guide/environments/example_envs.rst +++ b/src/admin-guide/environments/example_envs.rst @@ -19,6 +19,10 @@ Example installation command: conda env create -f path/to/env.yml --name "name of env" + # ..or if you haven't specified a python version in the enviroment file: + conda env create -f path/to/env.yml --name "name of env" python== + + Cylc 8 basic ------------ From e62f12a70980f39143c58679c9122a6f63c33d4a Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:12:25 +0100 Subject: [PATCH 10/27] fixed logic of envtest.yml to only require separate env files for each python version for the basic install --- .github/workflows/conda-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index aae6e214ab..6b727e5147 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -29,5 +29,5 @@ jobs: else conda env create -f \ src/admin-guide/environments/${{matrix.case}}.yml \ - python==${{python}} + python==${{matrix.python}} fi From b57c3f9d965f1280e1a66b49469d79e91af54694 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:30:05 +0100 Subject: [PATCH 11/27] fix over long env files --- src/admin-guide/environments/gui.yml | 131 +------------------ src/admin-guide/environments/live-basic.yml | 24 +--- src/admin-guide/environments/live-full.yml | 3 - src/admin-guide/environments/rose.yml | 138 +------------------- 4 files changed, 7 insertions(+), 289 deletions(-) diff --git a/src/admin-guide/environments/gui.yml b/src/admin-guide/environments/gui.yml index 7adfb65c4d..f77fb4a188 100644 --- a/src/admin-guide/environments/gui.yml +++ b/src/admin-guide/environments/gui.yml @@ -1,135 +1,6 @@ name: cylc-8-with-gui # Cylc 8 and the UI server installed from Conda channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-ui=0.5.0=ha770c72_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 + - cylc \ No newline at end of file diff --git a/src/admin-guide/environments/live-basic.yml b/src/admin-guide/environments/live-basic.yml index 3470626a69..b0e300de89 100644 --- a/src/admin-guide/environments/live-basic.yml +++ b/src/admin-guide/environments/live-basic.yml @@ -1,30 +1,8 @@ name: cylc-8-basic # Cylc 8 without GUI installed from the default GitHub branch. channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py39h06a4308_0 - - ld_impl_linux-64=2.35.1=h7274673_9 - - libffi=3.3=he6710b0_2 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - ncurses=6.2=he6710b0_1 - - openssl=1.1.1k=h27cfd23_0 - - pip=21.2.4=py37h06a4308_0 - - python=3.9.6=h12debd9_1 - - readline=8.1=h27cfd23_0 - - setuptools=52.0.0=py39h06a4308_0 - - sqlite=3.36.0=hc218d9a_0 - - tk=8.6.10=hbc83047_0 - - tzdata=2021a=h5d7bf9c_0 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zlib=1.2.11=h7b6447c_3 + - pip - pip: - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/live-full.yml b/src/admin-guide/environments/live-full.yml index f02ee0d918..4b745cd97d 100644 --- a/src/admin-guide/environments/live-full.yml +++ b/src/admin-guide/environments/live-full.yml @@ -3,11 +3,8 @@ name: cylc-8-live-with-rose # n.b. The UI needs to be installed with Yarn: For details see # https://github.com/cylc/cylc-ui channels: - - defaults - conda-forge - - kinow dependencies: - - python - pip - pip: - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/rose.yml b/src/admin-guide/environments/rose.yml index adb97aeaa3..341a267150 100644 --- a/src/admin-guide/environments/rose.yml +++ b/src/admin-guide/environments/rose.yml @@ -1,138 +1,10 @@ name: cylc-8-with-rose # Cylc 8, the UI server, Cylc Rose and Metomi Rose channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-rose=0.1.1=py37h89c1867_0 - - cylc-ui=0.5.0=ha770c72_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - ldap3=2.9.1=pyhd3eb1b0_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - metomi-rose=2.0b1=py37h5e8e339_1 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 + - cylc + - cylc-rose + - cylc-ui + - cylc-uiserver + - metomi-rose From eca163d6c930d06816cbc4d175c8f6c92f40dd03 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:35:02 +0100 Subject: [PATCH 12/27] stufgf --- src/admin-guide/environments/gui.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/admin-guide/environments/gui.yml b/src/admin-guide/environments/gui.yml index f77fb4a188..5963bca2b5 100644 --- a/src/admin-guide/environments/gui.yml +++ b/src/admin-guide/environments/gui.yml @@ -3,4 +3,4 @@ name: cylc-8-with-gui channels: - conda-forge dependencies: - - cylc \ No newline at end of file + - cylc From 1d34267e4a254774f72607b3ebfc8bbdf5979156 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:36:41 +0100 Subject: [PATCH 13/27] deleted old flder --- .../environments/basic.yml | 133 ------------------ 1 file changed, 133 deletions(-) delete mode 100644 src/administration-guide/environments/basic.yml diff --git a/src/administration-guide/environments/basic.yml b/src/administration-guide/environments/basic.yml deleted file mode 100644 index b067d58b20..0000000000 --- a/src/administration-guide/environments/basic.yml +++ /dev/null @@ -1,133 +0,0 @@ -name: cylc-8-basic -channels: - - defaults - - conda-forge - - kinow -dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 From b3716034dbd439cc548bc206b6c5b24c15dd0769 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 10:45:25 +0100 Subject: [PATCH 14/27] Update .github/workflows/conda-build-test.yml Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- .github/workflows/conda-build-test.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 6b727e5147..3ca6987fd0 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -1,9 +1,11 @@ name: conda builds on: - push: - branches: [master] + schedule: '17 22 * * 6' # Every Saturday pull_request: + paths: + - .github/workflows/conda-build-test.yml + - 'src/admin-guide/environments/*.ya?ml' workflow_dispatch: jobs: From 9a29751795394dd6189f2516cad894b70ae2986f Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 09:47:51 +0100 Subject: [PATCH 15/27] Response to review by @osanders: - slimmed recipies down - added detail to docs --- .github/workflows/conda-build-test.yml | 14 +- src/admin-guide/environments/basic-3.7.yml | 8 + src/admin-guide/environments/basic-3.8.yml | 8 + src/admin-guide/environments/basic-3.9.yml | 8 + src/admin-guide/environments/basic.yml | 132 ----------------- src/admin-guide/environments/example_envs.rst | 47 +++++- src/admin-guide/environments/gui.yml | 133 +---------------- src/admin-guide/environments/live-basic.yml | 26 +--- src/admin-guide/environments/live-full.yml | 7 +- src/admin-guide/environments/rose.yml | 138 +----------------- .../environments/basic.yml | 133 ----------------- 11 files changed, 85 insertions(+), 569 deletions(-) create mode 100644 src/admin-guide/environments/basic-3.7.yml create mode 100644 src/admin-guide/environments/basic-3.8.yml create mode 100644 src/admin-guide/environments/basic-3.9.yml delete mode 100644 src/admin-guide/environments/basic.yml delete mode 100644 src/administration-guide/environments/basic.yml diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index abd42d32e1..6b727e5147 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -13,11 +13,21 @@ jobs: strategy: matrix: case: [basic, gui, rose, live-basic, live-full] + python: [3.7, 3.8, 3.9] steps: - name: checkout cylc-doc uses: actions/checkout@v2 - name: build conda env ${{matrix.case}} run: | - conda env create -f \ - src/admin-guide/environments/${{matrix.case}}.yml + # Done like this so that we test all versions of python, + # and offer users examples of basic with all three versions + # but don't have to have three env.yml files for each case. + if [[ -f src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml ]]; then + conda env create -f \ + src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml + else + conda env create -f \ + src/admin-guide/environments/${{matrix.case}}.yml \ + python==${{matrix.python}} + fi diff --git a/src/admin-guide/environments/basic-3.7.yml b/src/admin-guide/environments/basic-3.7.yml new file mode 100644 index 0000000000..43a7e7aeb0 --- /dev/null +++ b/src/admin-guide/environments/basic-3.7.yml @@ -0,0 +1,8 @@ +name: cylc-8-basic-python-3.7 +# Cylc 8 without GUI installed from Conda Repos. +channels: + - conda-forge +dependencies: + - python=3.7 + - cylc-flow=8.* + - pip diff --git a/src/admin-guide/environments/basic-3.8.yml b/src/admin-guide/environments/basic-3.8.yml new file mode 100644 index 0000000000..bbd5c3b413 --- /dev/null +++ b/src/admin-guide/environments/basic-3.8.yml @@ -0,0 +1,8 @@ +name: cylc-8-basic-python-3.8 +# Cylc 8 without GUI installed from Conda Repos. +channels: + - conda-forge +dependencies: + - python=3.8 + - cylc-flow=8.* + - pip diff --git a/src/admin-guide/environments/basic-3.9.yml b/src/admin-guide/environments/basic-3.9.yml new file mode 100644 index 0000000000..c2afbab3ef --- /dev/null +++ b/src/admin-guide/environments/basic-3.9.yml @@ -0,0 +1,8 @@ +name: cylc-8-basic-python-3.9 +# Cylc 8 without GUI installed from Conda Repos. +channels: + - conda-forge +dependencies: + - python=3.9 + - cylc-flow=8.* + - pip diff --git a/src/admin-guide/environments/basic.yml b/src/admin-guide/environments/basic.yml deleted file mode 100644 index ee1030a6c3..0000000000 --- a/src/admin-guide/environments/basic.yml +++ /dev/null @@ -1,132 +0,0 @@ -name: cylc-8-basic -# Cylc 8 without GUI installed from Conda Repos. -channels: - - conda-forge -dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 diff --git a/src/admin-guide/environments/example_envs.rst b/src/admin-guide/environments/example_envs.rst index 4478ca49c3..020fb24a5e 100644 --- a/src/admin-guide/environments/example_envs.rst +++ b/src/admin-guide/environments/example_envs.rst @@ -10,36 +10,67 @@ A set of possible installations of Cylc: `Cylc 8 basic`_, ✔️, , , `Cylc 8 with UI Server`_, ✔️,✔️, , `Cylc 8 with Rose`_, ✔️,✔️,✔️, - `Cylc 8 basic live from github`_, ✔️, , ,✔️ - `Cylc 8 with rose and GUI live from github`_,✔️,✔️,✔️,✔️ + :ref:`Cylc 8 basic live from github `, ✔️, , ,✔️ + :ref:`Cylc 8 with rose and GUI live from github `,✔️,✔️,✔️,✔️ + +Example installation command: + +.. code-block:: bash + + conda env create -f path/to/env.yml --name "name of env" + + # ..or if you haven't specified a python version in the enviroment file: + conda env create -f path/to/env.yml --name "name of env" python== Cylc 8 basic ------------ -.. literalinclude:: basic.yml +In this case we are collecting the core workflow engine. + +Also demonstrates using different versions of Python. + +.. literalinclude:: basic-3.7.yml + :language: YAML + + +.. literalinclude:: basic-3.8.yml + :language: YAML + + +.. literalinclude:: basic-3.9.yml :language: YAML Cylc 8 with UI Server --------------------- +Create an enviroment containing the workflow engine and the GUI components +from releases available on conda-forge. + .. literalinclude:: gui.yml :language: YAML Cylc 8 with Rose ---------------- +In addition to the GUI components also add the Cylc-Rose plugin, and the +Rose configuration management system. + .. literalinclude:: rose.yml :language: YAML -Cylc 8 basic live from github ------------------------------ +.. _liveFromGH: + +Cylc 8 live from github +----------------------- + +In this case the ``enviroment.yml`` file will create a new enviroment and +download the latest development version of Cylc from github. One could +add ``@branch``, ``@hash`` or ``@tag`` to the end of the URL to specify a +particular version. .. literalinclude:: live-basic.yml :language: YAML -Cylc 8 with rose and GUI live from github ------------------------------------------ - .. literalinclude:: live-full.yml :language: YAML diff --git a/src/admin-guide/environments/gui.yml b/src/admin-guide/environments/gui.yml index 7adfb65c4d..bc2a1ca759 100644 --- a/src/admin-guide/environments/gui.yml +++ b/src/admin-guide/environments/gui.yml @@ -1,135 +1,6 @@ name: cylc-8-with-gui -# Cylc 8 and the UI server installed from Conda +# Cylc 8 and the GUI installed from Conda channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-ui=0.5.0=ha770c72_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 + - cylc diff --git a/src/admin-guide/environments/live-basic.yml b/src/admin-guide/environments/live-basic.yml index 3470626a69..a2de3b8c2b 100644 --- a/src/admin-guide/environments/live-basic.yml +++ b/src/admin-guide/environments/live-basic.yml @@ -1,30 +1,8 @@ -name: cylc-8-basic +name: cylc-8-live-basic # Cylc 8 without GUI installed from the default GitHub branch. channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py39h06a4308_0 - - ld_impl_linux-64=2.35.1=h7274673_9 - - libffi=3.3=he6710b0_2 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - ncurses=6.2=he6710b0_1 - - openssl=1.1.1k=h27cfd23_0 - - pip=21.2.4=py37h06a4308_0 - - python=3.9.6=h12debd9_1 - - readline=8.1=h27cfd23_0 - - setuptools=52.0.0=py39h06a4308_0 - - sqlite=3.36.0=hc218d9a_0 - - tk=8.6.10=hbc83047_0 - - tzdata=2021a=h5d7bf9c_0 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zlib=1.2.11=h7b6447c_3 + - pip - pip: - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/live-full.yml b/src/admin-guide/environments/live-full.yml index f02ee0d918..266738952c 100644 --- a/src/admin-guide/environments/live-full.yml +++ b/src/admin-guide/environments/live-full.yml @@ -1,13 +1,8 @@ name: cylc-8-live-with-rose -# Cylc 8, the UI server, Cylc Rose and Metomi Rose -# n.b. The UI needs to be installed with Yarn: For details see -# https://github.com/cylc/cylc-ui +# Cylc 8, the UI and UI server, Cylc Rose and Metomi Rose channels: - - defaults - conda-forge - - kinow dependencies: - - python - pip - pip: - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/rose.yml b/src/admin-guide/environments/rose.yml index adb97aeaa3..341a267150 100644 --- a/src/admin-guide/environments/rose.yml +++ b/src/admin-guide/environments/rose.yml @@ -1,138 +1,10 @@ name: cylc-8-with-rose # Cylc 8, the UI server, Cylc Rose and Metomi Rose channels: - - defaults - conda-forge - - kinow dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-rose=0.1.1=py37h89c1867_0 - - cylc-ui=0.5.0=ha770c72_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - ldap3=2.9.1=pyhd3eb1b0_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - metomi-rose=2.0b1=py37h5e8e339_1 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 + - cylc + - cylc-rose + - cylc-ui + - cylc-uiserver + - metomi-rose diff --git a/src/administration-guide/environments/basic.yml b/src/administration-guide/environments/basic.yml deleted file mode 100644 index b067d58b20..0000000000 --- a/src/administration-guide/environments/basic.yml +++ /dev/null @@ -1,133 +0,0 @@ -name: cylc-8-basic -channels: - - defaults - - conda-forge - - kinow -dependencies: - - _libgcc_mutex=0.1=main - - _openmp_mutex=4.5=1_gnu - - aiofiles=0.5.0=py37_0 - - alembic=1.6.4=pyhd3eb1b0_0 - - aniso8601=7.0.0=py_0 - - ansimarkup=1.5.0=pyh44b312d_0 - - asn1crypto=1.4.0=py_0 - - async_generator=1.10=py37h28b3542_0 - - attrs=21.2.0=pyhd3eb1b0_0 - - blas=1.0=mkl - - blinker=1.4=py37h06a4308_0 - - brotli=1.0.9=he6710b0_2 - - brotlipy=0.7.0=py37h27cfd23_1003 - - ca-certificates=2021.7.5=h06a4308_1 - - certifi=2021.5.30=py37h06a4308_0 - - certipy=0.1.3=py_0 - - cffi=1.14.0=py37h2e261b9_0 - - charset-normalizer=2.0.4=pyhd3eb1b0_0 - - click=8.0.1=pyhd3eb1b0_0 - - colorama=0.4.4=pyhd3eb1b0_0 - - configurable-http-proxy=4.2.3=node12_hac6e442_0 - - cryptography=2.3.1=py37hc365091_0 - - cycler=0.10.0=py37_0 - - cylc=8.0b1=py37h89c1867_0 - - cylc-flow=8.0b1=py37h89c1867_0 - - cylc-uiserver=0.4.0=py37h89c1867_0 - - empy=3.3.4=pyh9f0ad1d_1 - - entrypoints=0.3=py37_0 - - fonttools=4.25.0=pyhd3eb1b0_0 - - freetype=2.10.4=h5ab3b9f_0 - - graphene=2.1.9=pyhd8ed1ab_0 - - graphene-tornado=2.6.1=py_0 - - graphql-core=2.3.2=pyh9f0ad1d_0 - - graphql-relay=2.0.1=py_0 - - graphql-ws=0.3.1=pyh9f0ad1d_1 - - greenlet=1.1.1=py37h295c915_0 - - idna=3.2=pyhd3eb1b0_0 - - importlib-metadata=3.10.0=py37h06a4308_0 - - importlib_metadata=3.10.0=hd3eb1b0_0 - - intel-openmp=2021.3.0=h06a4308_3350 - - ipython_genutils=0.2.0=pyhd3eb1b0_1 - - jinja2=2.11.0=py_0 - - jpeg=9b=h024ee3a_2 - - jsonschema=3.2.0=py_2 - - jupyter_telemetry=0.1.0=py_0 - - jupyterhub=1.3.0=py37h06a4308_1 - - jupyterhub-base=1.3.0=py37h06a4308_1 - - kiwisolver=1.3.1=py37h2531618_0 - - lcms2=2.12=h3be6417_0 - - libcurl=7.61.1=heec0ca6_0 - - libedit=3.1.20210714=h7f8727e_0 - - libffi=3.2.1=hf484d3e_1007 - - libgcc-ng=9.3.0=h5101ec6_17 - - libgomp=9.3.0=h5101ec6_17 - - libpng=1.6.37=hbc83047_0 - - libprotobuf=3.15.8=h780b84a_0 - - libsodium=1.0.18=h7b6447c_0 - - libssh2=1.8.0=h9cfc8f7_4 - - libstdcxx-ng=9.3.0=hd4cf53a_17 - - libtiff=4.2.0=h85742a9_0 - - libwebp-base=1.2.0=h27cfd23_0 - - lz4-c=1.9.3=h295c915_1 - - mako=1.1.4=pyhd3eb1b0_0 - - markupsafe=2.0.1=py37h27cfd23_0 - - matplotlib-base=3.4.2=py37hab158f2_0 - - metomi-isodatetime=1!2.0.2=py_0 - - mkl=2021.3.0=h06a4308_520 - - mkl-service=2.4.0=py37h7f8727e_0 - - mkl_fft=1.3.0=py37h42c9631_2 - - mkl_random=1.2.2=py37h51133e4_0 - - munkres=1.1.4=py_0 - - ncurses=6.2=he6710b0_1 - - nodejs=12.4.0=he1b5a44_0 - - numpy=1.20.3=py37hf144106_0 - - numpy-base=1.20.3=py37h74d4b33_0 - - oauthlib=3.1.0=py_0 - - olefile=0.46=py37_0 - - openjpeg=2.4.0=h3ad879b_0 - - openssl=1.0.2u=h7b6447c_0 - - packaging=21.0=pyhd3eb1b0_0 - - pamela=1.0.0=py_0 - - pandas=0.25.3=py37he6710b0_0 - - pillow=8.3.1=py37h2c7a002_0 - - pip=21.2.2=py37h06a4308_0 - - prometheus_client=0.11.0=pyhd3eb1b0_0 - - promise=2.3=py37h06a4308_0 - - protobuf=3.15.8=py37hcd2ae1e_0 - - psutil=5.8.0=py37h27cfd23_1 - - pyasn1=0.4.8=py_0 - - pycparser=2.20=py_2 - - pycurl=7.43.0.2=py37hb7f436b_0 - - pyjwt=1.7.1=py37_0 - - pympler=0.9=py_0 - - pyopenssl=19.0.0=py37_0 - - pyparsing=2.4.7=pyhd3eb1b0_0 - - pyrsistent=0.17.3=py37h7b6447c_0 - - pysocks=1.7.1=py37_1 - - python=3.7.0=h6e4f718_3 - - python-dateutil=2.8.2=pyhd3eb1b0_0 - - python-editor=1.0.4=py_0 - - python-json-logger=2.0.1=py_0 - - python_abi=3.7=2_cp37m - - pytz=2021.1=pyhd3eb1b0_0 - - pyuv=1.4.0=py37h5e8e339_1003 - - pyzmq=19.0.2=py37he6710b0_1 - - readline=7.0=h7b6447c_5 - - requests=2.26.0=pyhd3eb1b0_0 - - ruamel.yaml=0.16.12=py37h7b6447c_1 - - ruamel.yaml.clib=0.2.2=py37h7b6447c_0 - - rx=1.6.1=py_0 - - setuptools=52.0.0=py37h06a4308_0 - - six=1.16.0=pyhd3eb1b0_0 - - sqlalchemy=1.4.22=py37h7f8727e_0 - - sqlite=3.33.0=h62c20be_0 - - tk=8.6.10=hbc83047_0 - - tornado=6.1=py37h27cfd23_0 - - traitlets=5.0.5=pyhd3eb1b0_0 - - typing_extensions=3.10.0.0=pyh06a4308_0 - - urllib3=1.26.6=pyhd3eb1b0_1 - - urwid=2.0.1=py37h516909a_1000 - - werkzeug=0.12.2=py_1 - - wheel=0.37.0=pyhd3eb1b0_0 - - xz=5.2.5=h7b6447c_0 - - zeromq=4.3.4=h2531618_0 - - zipp=3.5.0=pyhd3eb1b0_0 - - zlib=1.2.11=h7b6447c_3 - - zstd=1.4.9=haebb681_0 From 5cb366580301fbe103c4d92e6b7f55c146a35db6 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 11:06:59 +0100 Subject: [PATCH 16/27] fix schedule --- .github/workflows/conda-build-test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 3ca6987fd0..4d395c9093 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -1,12 +1,13 @@ name: conda builds on: - schedule: '17 22 * * 6' # Every Saturday pull_request: paths: - - .github/workflows/conda-build-test.yml + - '.github/workflows/conda-build-test.yml' - 'src/admin-guide/environments/*.ya?ml' - workflow_dispatch: + schedule: + - cron: '17 22 * * 6' + jobs: test_conda_install: From 142862d9f1cb46c45fa9f1e64c5bec5a078e7c99 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 11:30:02 +0100 Subject: [PATCH 17/27] added python dep to live installs --- src/admin-guide/environments/live-basic.yml | 1 + src/admin-guide/environments/live-full.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/src/admin-guide/environments/live-basic.yml b/src/admin-guide/environments/live-basic.yml index a2de3b8c2b..aa0de09dfb 100644 --- a/src/admin-guide/environments/live-basic.yml +++ b/src/admin-guide/environments/live-basic.yml @@ -3,6 +3,7 @@ name: cylc-8-live-basic channels: - conda-forge dependencies: + - python=3.9 - pip - pip: - git+https://github.com/cylc/cylc-flow.git diff --git a/src/admin-guide/environments/live-full.yml b/src/admin-guide/environments/live-full.yml index 266738952c..cfdc379661 100644 --- a/src/admin-guide/environments/live-full.yml +++ b/src/admin-guide/environments/live-full.yml @@ -3,6 +3,7 @@ name: cylc-8-live-with-rose channels: - conda-forge dependencies: + - python=3.9 - pip - pip: - git+https://github.com/cylc/cylc-flow.git From 86c2bf316b8f6ed99e1061db2fb9fb698e8d287c Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 12:09:44 +0100 Subject: [PATCH 18/27] Update .github/workflows/conda-build-test.yml Co-authored-by: Ronnie Dutta <61982285+MetRonnie@users.noreply.github.com> --- .github/workflows/conda-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 4d395c9093..b74e443ef5 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -7,7 +7,7 @@ on: - 'src/admin-guide/environments/*.ya?ml' schedule: - cron: '17 22 * * 6' - + workflow_dispatch jobs: test_conda_install: From 0c83fcdab468a32f2511671106a4cf783f968ee7 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 12:14:35 +0100 Subject: [PATCH 19/27] move example envs to reference section --- src/admin-guide/index.rst | 8 -------- src/index.rst | 1 - .../environments/basic-3.7.yml | 0 .../environments/basic-3.8.yml | 0 .../environments/basic-3.9.yml | 0 .../environments/example_envs.rst | 11 +---------- src/{admin-guide => reference}/environments/gui.yml | 0 .../environments/live-basic.yml | 0 .../environments/live-full.yml | 0 src/{admin-guide => reference}/environments/rose.yml | 0 src/reference/index.rst | 1 + 11 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 src/admin-guide/index.rst rename src/{admin-guide => reference}/environments/basic-3.7.yml (100%) rename src/{admin-guide => reference}/environments/basic-3.8.yml (100%) rename src/{admin-guide => reference}/environments/basic-3.9.yml (100%) rename src/{admin-guide => reference}/environments/example_envs.rst (86%) rename src/{admin-guide => reference}/environments/gui.yml (100%) rename src/{admin-guide => reference}/environments/live-basic.yml (100%) rename src/{admin-guide => reference}/environments/live-full.yml (100%) rename src/{admin-guide => reference}/environments/rose.yml (100%) diff --git a/src/admin-guide/index.rst b/src/admin-guide/index.rst deleted file mode 100644 index 460b8adaf8..0000000000 --- a/src/admin-guide/index.rst +++ /dev/null @@ -1,8 +0,0 @@ -Administration Guide -==================== - - -.. toctree:: - :maxdepth: 2 - - environments/example_envs.rst \ No newline at end of file diff --git a/src/index.rst b/src/index.rst index b448e14e3b..76052cc54a 100644 --- a/src/index.rst +++ b/src/index.rst @@ -26,5 +26,4 @@ indefinitely. plugins/index workflow-design-guide/index reference/index - admin-guide/index glossary diff --git a/src/admin-guide/environments/basic-3.7.yml b/src/reference/environments/basic-3.7.yml similarity index 100% rename from src/admin-guide/environments/basic-3.7.yml rename to src/reference/environments/basic-3.7.yml diff --git a/src/admin-guide/environments/basic-3.8.yml b/src/reference/environments/basic-3.8.yml similarity index 100% rename from src/admin-guide/environments/basic-3.8.yml rename to src/reference/environments/basic-3.8.yml diff --git a/src/admin-guide/environments/basic-3.9.yml b/src/reference/environments/basic-3.9.yml similarity index 100% rename from src/admin-guide/environments/basic-3.9.yml rename to src/reference/environments/basic-3.9.yml diff --git a/src/admin-guide/environments/example_envs.rst b/src/reference/environments/example_envs.rst similarity index 86% rename from src/admin-guide/environments/example_envs.rst rename to src/reference/environments/example_envs.rst index b3ffbf20eb..f3b23f1a9d 100644 --- a/src/admin-guide/environments/example_envs.rst +++ b/src/reference/environments/example_envs.rst @@ -13,16 +13,7 @@ A set of possible installations of Cylc: :ref:`Cylc 8 basic live from github `, ✔️, , ,✔️ :ref:`Cylc 8 with rose and GUI live from github `,✔️,✔️,✔️,✔️ -Example installation command: - -.. code-block:: bash - - conda env create -f path/to/env.yml --name "name of env" - - # ..or if you haven't specified a python version in the enviroment file: - conda env create -f path/to/env.yml --name "name of env" python== - -Example installation command: +Example installation commands: .. code-block:: bash diff --git a/src/admin-guide/environments/gui.yml b/src/reference/environments/gui.yml similarity index 100% rename from src/admin-guide/environments/gui.yml rename to src/reference/environments/gui.yml diff --git a/src/admin-guide/environments/live-basic.yml b/src/reference/environments/live-basic.yml similarity index 100% rename from src/admin-guide/environments/live-basic.yml rename to src/reference/environments/live-basic.yml diff --git a/src/admin-guide/environments/live-full.yml b/src/reference/environments/live-full.yml similarity index 100% rename from src/admin-guide/environments/live-full.yml rename to src/reference/environments/live-full.yml diff --git a/src/admin-guide/environments/rose.yml b/src/reference/environments/rose.yml similarity index 100% rename from src/admin-guide/environments/rose.yml rename to src/reference/environments/rose.yml diff --git a/src/reference/index.rst b/src/reference/index.rst index 373dc9d631..dc56d9e1f2 100644 --- a/src/reference/index.rst +++ b/src/reference/index.rst @@ -7,4 +7,5 @@ Reference config/index api/index + environments/example_envs.rst dev-history-major-changes From 3e60edf16a893f4c6ccd39d86b7ada678721e585 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 12:17:39 +0100 Subject: [PATCH 20/27] fix test build envs --- .github/workflows/conda-build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index b74e443ef5..5f16db9214 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -7,7 +7,7 @@ on: - 'src/admin-guide/environments/*.ya?ml' schedule: - cron: '17 22 * * 6' - workflow_dispatch + workflow_dispatch: jobs: test_conda_install: From c2057caff5fe61fa3b32ffe2d6c0293e0ce4bcb0 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 12:27:17 +0100 Subject: [PATCH 21/27] Fix breakage --- .github/workflows/conda-build-test.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 5f16db9214..ee853d4bac 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -4,7 +4,7 @@ on: pull_request: paths: - '.github/workflows/conda-build-test.yml' - - 'src/admin-guide/environments/*.ya?ml' + - 'src/reference/environments/*.ya?ml' schedule: - cron: '17 22 * * 6' workflow_dispatch: @@ -18,6 +18,12 @@ jobs: case: [basic, gui, rose, live-basic, live-full] python: [3.7, 3.8, 3.9] steps: + # - name: install conda + # run: | + # wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh + # chmod +x Miniconda3-latest-Linux-x86_64.sh + # bash Miniconda3-latest-Linux-x86_64.sh -y + - name: checkout cylc-doc uses: actions/checkout@v2 @@ -26,11 +32,11 @@ jobs: # Done like this so that we test all versions of python, # and offer users examples of basic with all three versions # but don't have to have three env.yml files for each case. - if [[ -f src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml ]]; then + if [[ -f src/reference/environments/${{matrix.case}}-${{matrix.python}}.yml ]]; then conda env create -f \ - src/admin-guide/environments/${{matrix.case}}-${{matrix.python}}.yml + src/reference/environments/${{matrix.case}}-${{matrix.python}}.yml else conda env create -f \ - src/admin-guide/environments/${{matrix.case}}.yml \ + src/reference/environments/${{matrix.case}}.yml \ python==${{matrix.python}} fi From 97372abd651859ee8b11e7b74d9130bb1089ded8 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 13:45:11 +0100 Subject: [PATCH 22/27] fixed some envs --- .github/workflows/conda-build-test.yml | 8 +------- src/reference/environments/example_envs.rst | 8 -------- src/reference/environments/gui.yml | 3 ++- src/reference/environments/rose.yml | 3 +-- 4 files changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index ee853d4bac..5cea9b9e57 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -11,19 +11,13 @@ on: jobs: test_conda_install: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest timeout-minutes: 10 strategy: matrix: case: [basic, gui, rose, live-basic, live-full] python: [3.7, 3.8, 3.9] steps: - # - name: install conda - # run: | - # wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh - # chmod +x Miniconda3-latest-Linux-x86_64.sh - # bash Miniconda3-latest-Linux-x86_64.sh -y - - name: checkout cylc-doc uses: actions/checkout@v2 diff --git a/src/reference/environments/example_envs.rst b/src/reference/environments/example_envs.rst index f3b23f1a9d..9a444ebe11 100644 --- a/src/reference/environments/example_envs.rst +++ b/src/reference/environments/example_envs.rst @@ -33,14 +33,6 @@ Also demonstrates using different versions of Python. .. literalinclude:: basic-3.7.yml :language: YAML - -.. literalinclude:: basic-3.8.yml - :language: YAML - - -.. literalinclude:: basic-3.9.yml - :language: YAML - Cylc 8 with UI Server --------------------- diff --git a/src/reference/environments/gui.yml b/src/reference/environments/gui.yml index bc2a1ca759..2c948c004a 100644 --- a/src/reference/environments/gui.yml +++ b/src/reference/environments/gui.yml @@ -3,4 +3,5 @@ name: cylc-8-with-gui channels: - conda-forge dependencies: - - cylc + - cylc-flow + - cylc-uiserver diff --git a/src/reference/environments/rose.yml b/src/reference/environments/rose.yml index 341a267150..b25c7ec660 100644 --- a/src/reference/environments/rose.yml +++ b/src/reference/environments/rose.yml @@ -3,8 +3,7 @@ name: cylc-8-with-rose channels: - conda-forge dependencies: - - cylc + - cylc-flow - cylc-rose - - cylc-ui - cylc-uiserver - metomi-rose From 7abb1171e9b6c60da107e5ac6ef45a35487345e0 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 13:48:59 +0100 Subject: [PATCH 23/27] removed section about building conda envs for cylc using pip --- src/reference/environments/example_envs.rst | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/src/reference/environments/example_envs.rst b/src/reference/environments/example_envs.rst index 9a444ebe11..af765ff3c9 100644 --- a/src/reference/environments/example_envs.rst +++ b/src/reference/environments/example_envs.rst @@ -9,9 +9,7 @@ A set of possible installations of Cylc: environment, cylc, cylc uiserver, rose, install latest from github `Cylc 8 basic`_, ✔️, , , `Cylc 8 with UI Server`_, ✔️,✔️, , - `Cylc 8 with Rose`_, ✔️,✔️,✔️, - :ref:`Cylc 8 basic live from github `, ✔️, , ,✔️ - :ref:`Cylc 8 with rose and GUI live from github `,✔️,✔️,✔️,✔️ + `Cylc 8 with Rose`_, ✔️,✔️,✔️ Example installation commands: @@ -50,19 +48,3 @@ Rose configuration management system. .. literalinclude:: rose.yml :language: YAML - -.. _liveFromGH: - -Cylc 8 live from github ------------------------ - -In this case the ``enviroment.yml`` file will create a new enviroment and -download the latest development version of Cylc from github. One could -add ``@branch``, ``@hash`` or ``@tag`` to the end of the URL to specify a -particular version. - -.. literalinclude:: live-basic.yml - :language: YAML - -.. literalinclude:: live-full.yml - :language: YAML From a7e6ee3471fd365c348e4c8a483f97e8dbcb8435 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Mon, 6 Sep 2021 13:59:04 +0100 Subject: [PATCH 24/27] fix table render --- src/reference/environments/example_envs.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/reference/environments/example_envs.rst b/src/reference/environments/example_envs.rst index af765ff3c9..1ebfa7d481 100644 --- a/src/reference/environments/example_envs.rst +++ b/src/reference/environments/example_envs.rst @@ -4,11 +4,10 @@ Example Environments A set of possible installations of Cylc: .. csv-table:: - :header-rows:1 - - environment, cylc, cylc uiserver, rose, install latest from github - `Cylc 8 basic`_, ✔️, , , - `Cylc 8 with UI Server`_, ✔️,✔️, , + :header: environment, cylc, cylc uiserver, rose + + `Cylc 8 basic`_, ✔️, , + `Cylc 8 with UI Server`_, ✔️,✔️, `Cylc 8 with Rose`_, ✔️,✔️,✔️ Example installation commands: From a7cdffd1a8702ab497c172cab8dcfe83976cee8b Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Tue, 7 Sep 2021 07:33:22 +0100 Subject: [PATCH 25/27] Response to review --- .github/workflows/conda-build-test.yml | 2 +- src/reference/environments/basic-3.7.yml | 3 +-- src/reference/environments/basic-3.9.yml | 8 -------- .../environments/{basic-3.8.yml => basic.yml} | 4 +--- src/reference/environments/example_envs.rst | 12 +++--------- src/reference/environments/gui.yml | 2 +- src/reference/environments/live-basic.yml | 9 --------- src/reference/environments/live-full.yml | 12 ------------ 8 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 src/reference/environments/basic-3.9.yml rename src/reference/environments/{basic-3.8.yml => basic.yml} (66%) delete mode 100644 src/reference/environments/live-basic.yml delete mode 100644 src/reference/environments/live-full.yml diff --git a/.github/workflows/conda-build-test.yml b/.github/workflows/conda-build-test.yml index 5cea9b9e57..a2eb75e179 100644 --- a/.github/workflows/conda-build-test.yml +++ b/.github/workflows/conda-build-test.yml @@ -15,7 +15,7 @@ jobs: timeout-minutes: 10 strategy: matrix: - case: [basic, gui, rose, live-basic, live-full] + case: [basic, gui, rose] python: [3.7, 3.8, 3.9] steps: - name: checkout cylc-doc diff --git a/src/reference/environments/basic-3.7.yml b/src/reference/environments/basic-3.7.yml index 43a7e7aeb0..fba24a087a 100644 --- a/src/reference/environments/basic-3.7.yml +++ b/src/reference/environments/basic-3.7.yml @@ -1,8 +1,7 @@ name: cylc-8-basic-python-3.7 -# Cylc 8 without GUI installed from Conda Repos. +# Cylc 8 without GUI channels: - conda-forge dependencies: - python=3.7 - cylc-flow=8.* - - pip diff --git a/src/reference/environments/basic-3.9.yml b/src/reference/environments/basic-3.9.yml deleted file mode 100644 index c2afbab3ef..0000000000 --- a/src/reference/environments/basic-3.9.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: cylc-8-basic-python-3.9 -# Cylc 8 without GUI installed from Conda Repos. -channels: - - conda-forge -dependencies: - - python=3.9 - - cylc-flow=8.* - - pip diff --git a/src/reference/environments/basic-3.8.yml b/src/reference/environments/basic.yml similarity index 66% rename from src/reference/environments/basic-3.8.yml rename to src/reference/environments/basic.yml index bbd5c3b413..b165856af7 100644 --- a/src/reference/environments/basic-3.8.yml +++ b/src/reference/environments/basic.yml @@ -1,8 +1,6 @@ -name: cylc-8-basic-python-3.8 +name: cylc-8-basic-python-3.7 # Cylc 8 without GUI installed from Conda Repos. channels: - conda-forge dependencies: - - python=3.8 - cylc-flow=8.* - - pip diff --git a/src/reference/environments/example_envs.rst b/src/reference/environments/example_envs.rst index 1ebfa7d481..03a7cf4347 100644 --- a/src/reference/environments/example_envs.rst +++ b/src/reference/environments/example_envs.rst @@ -1,7 +1,7 @@ Example Environments ==================== -A set of possible installations of Cylc: +A set of example Conda Cylc Environments: .. csv-table:: :header: environment, cylc, cylc uiserver, rose @@ -16,16 +16,11 @@ Example installation commands: conda env create -f path/to/env.yml --name "name of env" - # ..or if you haven't specified a python version in the enviroment file: - conda env create -f path/to/env.yml --name "name of env" python== - Cylc 8 basic ------------ -In this case we are collecting the core workflow engine. - -Also demonstrates using different versions of Python. +This environment contains the core workflow engine and shows how to specify a particular version of Python. .. literalinclude:: basic-3.7.yml :language: YAML @@ -33,8 +28,7 @@ Also demonstrates using different versions of Python. Cylc 8 with UI Server --------------------- -Create an enviroment containing the workflow engine and the GUI components -from releases available on conda-forge. +An environment containing the workflow engine and the GUI components. .. literalinclude:: gui.yml :language: YAML diff --git a/src/reference/environments/gui.yml b/src/reference/environments/gui.yml index 2c948c004a..79c6425626 100644 --- a/src/reference/environments/gui.yml +++ b/src/reference/environments/gui.yml @@ -1,5 +1,5 @@ name: cylc-8-with-gui -# Cylc 8 and the GUI installed from Conda +# Cylc 8 and the GUI channels: - conda-forge dependencies: diff --git a/src/reference/environments/live-basic.yml b/src/reference/environments/live-basic.yml deleted file mode 100644 index aa0de09dfb..0000000000 --- a/src/reference/environments/live-basic.yml +++ /dev/null @@ -1,9 +0,0 @@ -name: cylc-8-live-basic -# Cylc 8 without GUI installed from the default GitHub branch. -channels: - - conda-forge -dependencies: - - python=3.9 - - pip - - pip: - - git+https://github.com/cylc/cylc-flow.git diff --git a/src/reference/environments/live-full.yml b/src/reference/environments/live-full.yml deleted file mode 100644 index cfdc379661..0000000000 --- a/src/reference/environments/live-full.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: cylc-8-live-with-rose -# Cylc 8, the UI and UI server, Cylc Rose and Metomi Rose -channels: - - conda-forge -dependencies: - - python=3.9 - - pip - - pip: - - git+https://github.com/cylc/cylc-flow.git - - git+https://github.com/cylc/cylc-uiserver.git - - git+https://github.com/metomi/rose.git - - git+https://github.com/cylc/cylc-rose.git From a8aeb80bb4bd818caf28a4801e8afa2927af879f Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Wed, 8 Sep 2021 07:26:53 +0100 Subject: [PATCH 26/27] Update src/reference/environments/basic.yml --- src/reference/environments/basic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reference/environments/basic.yml b/src/reference/environments/basic.yml index b165856af7..c4b107ce99 100644 --- a/src/reference/environments/basic.yml +++ b/src/reference/environments/basic.yml @@ -1,4 +1,4 @@ -name: cylc-8-basic-python-3.7 +name: cylc-8-basic # Cylc 8 without GUI installed from Conda Repos. channels: - conda-forge From 7ff355163ed47d63a493c41eb926845b6c6bddf0 Mon Sep 17 00:00:00 2001 From: Tim Pillinger <26465611+wxtim@users.noreply.github.com> Date: Wed, 8 Sep 2021 07:30:28 +0100 Subject: [PATCH 27/27] uniform docstrings wrt to UI/GUI --- src/reference/environments/basic-3.7.yml | 2 +- src/reference/environments/basic.yml | 5 +++-- src/reference/environments/gui.yml | 2 +- src/reference/environments/rose.yml | 3 ++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/reference/environments/basic-3.7.yml b/src/reference/environments/basic-3.7.yml index fba24a087a..303ba94360 100644 --- a/src/reference/environments/basic-3.7.yml +++ b/src/reference/environments/basic-3.7.yml @@ -1,5 +1,5 @@ name: cylc-8-basic-python-3.7 -# Cylc 8 without GUI +# Cylc 8 without UI Server. channels: - conda-forge dependencies: diff --git a/src/reference/environments/basic.yml b/src/reference/environments/basic.yml index b165856af7..80d29f160c 100644 --- a/src/reference/environments/basic.yml +++ b/src/reference/environments/basic.yml @@ -1,5 +1,6 @@ -name: cylc-8-basic-python-3.7 -# Cylc 8 without GUI installed from Conda Repos. +name: cylc-8-basic +# Cylc 8 without the UI Server. + channels: - conda-forge dependencies: diff --git a/src/reference/environments/gui.yml b/src/reference/environments/gui.yml index 79c6425626..509ce1ed01 100644 --- a/src/reference/environments/gui.yml +++ b/src/reference/environments/gui.yml @@ -1,5 +1,5 @@ name: cylc-8-with-gui -# Cylc 8 and the GUI +# Cylc 8 and the also the UI Server (which provides the web GUI). channels: - conda-forge dependencies: diff --git a/src/reference/environments/rose.yml b/src/reference/environments/rose.yml index b25c7ec660..de89225152 100644 --- a/src/reference/environments/rose.yml +++ b/src/reference/environments/rose.yml @@ -1,5 +1,6 @@ name: cylc-8-with-rose -# Cylc 8, the UI server, Cylc Rose and Metomi Rose +# Cylc 8, the UI Server (which provides the web GUI). +# and the Cylc Rose plugin (which requires metomi-rose). channels: - conda-forge dependencies: