Skip to content

Commit

Permalink
Merge pull request #115 from matt-sd-watson/master
Browse files Browse the repository at this point in the history
Additional setup dependency for jupyter-client
  • Loading branch information
aineniamh authored Jul 16, 2021
2 parents 31b64ef + 997366d commit 489af3f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
build/
civet.egg-info/
dist/
4 changes: 2 additions & 2 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Instructions for installing civet locally

### Install civet

1. ``git clone https://github.com/COG-UK/civet.git`` and ``cd civet``
1. ``git clone https://github.com/artic-network/civet.git`` and ``cd civet``
2. ``conda env create -f environment.yml``
3. ``conda activate civet``
4. ``python setup.py install``
Expand Down Expand Up @@ -52,4 +52,4 @@ updates the conda environment
- Try ``pip uninstall civet`` and then re-install with `python setup.py install`


### [Next: Input options](./input_options.md)
### [Next: Input options](./input_options.md)
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ def run(self):
"grip>=4.5.2",
"tabulate>=0.8.7",
"snipit>=1.0.3",
"traitlets>=5.0"
"traitlets>=5.0",
"jupyter-client<7.0"
],
cmdclass={
'npm_install': NPMInstall
Expand Down

0 comments on commit 489af3f

Please sign in to comment.