Skip to content

Commit 133eefb

Browse files
authored
Merge pull request #2 from danforthcenter/readme-edits
lab meeting demo
2 parents 1b4548d + f6d2ba3 commit 133eefb

File tree

4 files changed

+27
-84
lines changed

4 files changed

+27
-84
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,7 @@ cython_debug/
150150
# and can be added to the global gitignore or merged into this file. For a more nuclear
151151
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
152152
#.idea/
153+
154+
# emacs lock files
155+
\#*\#
156+
[.]\#*

littlecv/littlecv/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dummy versioning
2-
# __version__ = "0.0.1"
2+
__author__ = "soon you"
33

44
from littlecv.littlecv.analyze_size import size
55
from littlecv.littlecv.outputs import Outputs

readme.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ This repository is a place for you to learn to contribute to PlantCV in one of o
44

55
## Getting started
66

7-
To get started you will need an environment with at least `numpy`, `cv2`, and `...` python libraries installed. If you are looking to contribute to PlantCV then you may already have a conda environment set up for PlantCV and that would work great for this as well.
7+
To get started you will need an environment with at least `numpy`, `cv2`, `matplotlib`, `pandas`, `python-dateutil`, and `skikit-image` Python libraries installed. We recommend installing `PlantCV` in editable mode if you have not already done so as that will be best for contributing and will install everything you need for this activity. If you are looking to contribute to PlantCV then you may already have a conda environment set up for `PlantCV` and that would work for this workshop as well, whether `PlantCV` is editable or not in that installation.
88

99
### Installing littlecv
1010

11-
* First, Clone this repository (`git clone https://github.com/danforthcenter/contributing_tutorial.git`). Throughout this readme we include git CLI commands but Github Desktop, Git Kraken, or Git through VSCode/other IDEs are all friendlier options and worth learning to use.
11+
* First, Clone this repository (`git clone https://github.com/danforthcenter/contributing_tutorial.git`). Throughout this readme we include git CLI commands but [Github Desktop](https://github.com/apps/desktop), [Git Kraken](https://www.gitkraken.com/), or Git through VSCode/other IDEs are all friendlier options and worth learning to use.
1212
* Next, `cd` to the cloned repo (`cd contributing_tutorial`)
13-
* Install `littlecv` by running `pip install -e .`. You should do this with your `PlantCV` conda environment active, or in another suitable environment.
13+
* Finally, with your `PlantCV` or equivalent environment active, install `littlecv` by running `pip install -e .`.
1414

15-
Now you will have an editable version of `littlecv` installed locally.
15+
Now you will have an editable version of `littlecv` installed locally. You can check your installation by running this command, which should tell you that you'll be an author soon:
16+
17+
```
18+
python -c "from littlecv import littlecv as lcv; print(lcv.__author__)"
19+
```
1620

1721
## The task
1822

@@ -22,6 +26,7 @@ There is also an iPython notebook running a simple workflow using `littleCV`. In
2226

2327
The final piece of the `workflow.ipynb` checks the area phenotype, when that check returns `True` you have made the required edit in the `littlecv` codebase and you can send your edits to github. You should not be editing steps in the `workflow.ipynb` file to try to make that last statement return `True`, the only changes you need to make are in the codebase. If you prefer to work outside of jupyter notebooks you can also make edits to the `littlecv` codebase and run the tests for the package with the `py.test --cov littlecv` in the `contributing_tutorial` directory which will run the test in the `contributing_tutorial/tests` directory which makes the same assertion as at the end of the jupyter notebook. Once you are contributing to `PlantCV` you should familiarize with troubleshooting based on reports from `py.test`.
2428

29+
2530
#### Steps
2631

2732
* 1: Open a branch with your name (`git checkout -b first_last`).

workflow.ipynb

Lines changed: 13 additions & 79 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)