Skip to content

Commit

Permalink
Merge branch 'main' of github.com:UBC-MOAD/docs
Browse files Browse the repository at this point in the history
  • Loading branch information
douglatornell committed Jun 28, 2024
2 parents d1bfb84 + 52a02d6 commit 44efb08
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
4 changes: 2 additions & 2 deletions alliance-computing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ These are the setup steps that you need to do when you start using ``graham`` fo
type %USERPROFILE%/.ssh/id_ed25519.pub
Alternatively,
you can open your :file:`id_ed25519.pub` in VS Code and copy it from there to the CCDB page.
Alternatively,
you can open your :file:`id_ed25519.pub` in VS Code and copy it from there to the CCDB page.

.. _public key into into the CCDB system: https://docs.alliancecan.ca/wiki/SSH_Keys#Using_CCDB

Expand Down
3 changes: 1 addition & 2 deletions python_packaging/pkg_structure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -381,10 +381,9 @@ That file `declares the features of the environment`_ that we want readthedocs t
specifically,
a conda environment that we describe in the :file:`envs/environment-rtd.yaml` file
(described below),
built using the `mambaforge`_ environment and package manager on an Ubuntu Linux virtual machine.
built using the ``mambaforge`` environment and package manager on an Ubuntu Linux virtual machine.

.. _declares the features of the environment: https://docs.readthedocs.io/en/stable/config-file/v2.html
.. _mambaforge: https://mamba.readthedocs.io/en/latest/installation.html

The :file:`.readthedocs.yaml` file for the `NEMO-Cmd`_ package is typical,
and looks like:
Expand Down
12 changes: 6 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ docutils==0.18.1
fastjsonschema==2.18.0
filelock==3.12.3
identify==2.5.28
idna==3.4
idna==3.7
imagesize==1.4.1
Jinja2==3.1.2
Jinja2==3.1.4
jsonschema==4.19.0
jsonschema-specifications==2023.7.1
jupyter_client==8.3.1
Expand All @@ -35,7 +35,7 @@ nbsphinx==0.9.3
nodeenv==1.8.0
packaging==23.1
pandocfilters==1.5.0
pip==23.2.1
pip==23.3
platformdirs==3.10.0
pre-commit==3.4.0
pycparser==2.21
Expand All @@ -44,7 +44,7 @@ python-dateutil==2.8.2
PyYAML==6.0.1
pyzmq==25.1.1
referencing==0.30.2
requests==2.31.0
requests==2.32.0
rpds-py==0.10.3
setuptools==68.2.2
six==1.16.0
Expand All @@ -61,11 +61,11 @@ sphinxcontrib-jsmath==1.0.1
sphinxcontrib-qthelp==1.0.6
sphinxcontrib-serializinghtml==1.1.9
tinycss2==1.2.1
tornado==6.3.3
tornado==6.4.1
traitlets==5.9.0
typing_extensions==4.7.1
ukkonen==1.0.1
urllib3==2.0.7
urllib3==2.2.2
virtualenv==20.24.4
webencodings==0.5.1
wheel==0.41.2

0 comments on commit 44efb08

Please sign in to comment.