Skip to content

Commit 84a56a4

Browse files
committed
update 2021
1 parent 9729663 commit 84a56a4

8 files changed

Lines changed: 33 additions & 32 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
.sass-cache
66
__pycache__
77
_site
8+
.jekyll-cache

_config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
carpentry: "swc"
77

88
# Overall title for pages.
9-
title: "EEOB/BCB 546X: Programming with Python"
9+
title: "EEOB/BCB 546: Programming with Python"
1010

1111
# Contact email address.
1212
email: trayc7@gmail.com
@@ -24,7 +24,7 @@ repository: <USERNAME>/<PROJECT>
2424

2525
# Sites.
2626
amy_site: "https://amy.software-carpentry.org/workshops"
27-
bcb_site: "http://eeob-biodata.github.io/BCB546X-Spring2017"
27+
bcb_site: "https://eeob-biodata.github.io/EEOB-BCB-546/"
2828
dc_site: "http://datacarpentry.org"
2929
swc_github: "https://github.com/swcarpentry"
3030
swc_site: "https://software-carpentry.org"
@@ -37,8 +37,8 @@ workshop_site: "https://swcarpentry.github.io/workshop-template"
3737
training_site: "https://swcarpentry.github.io/instructor-training"
3838

3939
# Surveys.
40-
pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="
41-
post_survey: "https://www.surveymonkey.com/r/swc_post_workshop_v1?workshop_id="
40+
# pre_survey: "https://www.surveymonkey.com/r/swc_pre_workshop_v1?workshop_id="
41+
# post_survey: "https://www.surveymonkey.com/r/swc_post_workshop_v1?workshop_id="
4242

4343
# Start time in minutes (0 to be clock-independent, 540 to show a start at 09:00 am)
4444
start_time: 0

_episodes/01-intro.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ o
137137
>
138138
> Count the number of Gs in the sequence above using a `for` loop. What is the difference between Python (see above) and R (in solution below) implementations?
139139
>
140-
> > ## Solution
140+
<!-- > > ## Solution
141141
> > ~~~
142142
> > seq <- 'GACTTAATGGGCAATAGGCAAGCACTTGAAAAAGATGCCAACGACATGAAAACACAAGACAA'
143143
> > seq_split <- strsplit(seq, "")[[1]]
@@ -149,14 +149,14 @@ o
149149
> > }
150150
> > print(count)
151151
> > ~~~
152-
> {: .solution}
152+
> {: .solution} -->
153153
{: .challenge}
154154
155155
> ## What is the simplest way to count the Gs?
156156
>
157157
> Count the number of Gs in the sequence above using either R or Python in a simpler way.
158158
>
159-
> > ## Python Solution
159+
<!-- > > ## Python Solution
160160
> > ~~~
161161
> > seq <- 'GACTTAATGGGCAATAGGCAAGCACTTGAAAAAGATGCCAACGACATGAAAACACAAGA'
162162
> > print(seq.count('G'))
@@ -170,7 +170,7 @@ o
170170
> > library(stringr)
171171
> > str_count(seq,'G')
172172
> > ~~~
173-
> {: .solution}
173+
> {: .solution} -->
174174
{: .challenge}
175175
176176
There are a lot of blogs and articles comparing R and Python. Many of these comparisons (like this [infographic](https://www.datacamp.com/community/tutorials/r-or-python-for-data-analysis#gs.3P0PoiY)) do not tell you which is "better". That's because this is up to you. It really depends on what you're trying to do. Typically for a lot of bioinformatics projects, you will find yourself needing to know both. This is simply because many of the very useful tools for working with biological data are written in a variety of languages. Thus, it is up to the researcher to interact with them and develop cohesive pipelines for data curation and analysis.
@@ -187,8 +187,8 @@ You can run python in various tools. Perhaps the most straightforward is to use
187187
$ python
188188
```
189189
~~~
190-
Python 3.7.3 (default, Mar 27 2019, 16:54:48)
191-
[Clang 4.0.1 (tags/RELEASE_401/final)] :: Anaconda, Inc. on darwin
190+
Python 3.8.5 (default, Sep 4 2020, 02:22:02)
191+
[Clang 10.0.0 ] :: Anaconda, Inc. on darwin
192192
Type "help", "copyright", "credits" or "license" for more information.
193193
>>>
194194
~~~
@@ -253,21 +253,21 @@ HELLO
253253
254254
### Python on the Cluster
255255
256-
Our HPC systems do not use the Anaconda install of Python. Additionally, the default versions of Python that is available globally is Python 2.7. Thus, if you would like to use HPC-Class to interact with Python, you will have to load the Python 3 module after logging on to the cluster (`ssh <ISU Net ID>@hpc-class.its.iastate.edu`).
256+
Our HPC systems do not use the Anaconda install of Python. Additionally, the default versions of Python that is available globally is Python 2.7. Thus, if you would like to use HPC-Class to interact with Python, it is recommended that you load the Python 3 module after logging on to the cluster (`ssh <ISU Net ID>@hpc-class.its.iastate.edu`).
257257
258258
```
259-
$ module load python/3.6.5-fwk5uaj
259+
$ module load python
260260
```
261261
262262
Once you have loaded the Python 3 module, you can open the `python3` interpreter:
263263
264264
```
265-
$ python3
265+
$ python
266266
```
267267
268268
~~~
269-
Python 3.6.5 (default, May 29 2018, 16:28:47)
270-
[GCC 4.8.5 20150623 (Red Hat 4.8.5-28)] on linux
269+
Python 3.7.7 (default, Jun 15 2020, 12:59:09)
270+
[GCC 4.8.5 20150623 (Red Hat 4.8.5-36)] on linux
271271
Type "help", "copyright", "credits" or "license" for more information.
272272
>>>
273273
~~~
@@ -339,8 +339,8 @@ Each cell in a Jupyter notebook can be executed and you can choose the type of c
339339
>
340340
> Replicate one of the solutions give above in a Jupyter notebook. Add some Markdown text to describe your program.
341341
>
342-
> > ## Solution
342+
<!-- > > ## Solution
343343
> >
344344
> > ![jupyter browser](../fig/jupyter3.png)
345-
> {: .solution}
345+
> {: .solution} -->
346346
{: .challenge}

_episodes/02-datatypes.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ my_list = [0,1,2]
179179
>
180180
> Change the value of a single element in `my_list ` and `my_tuple`.
181181
>
182-
> > ## Solution: List
182+
<!-- > > ## Solution: List
183183
> >
184184
> > ~~~
185185
> > my_list[1] = 5
@@ -206,7 +206,7 @@ my_list = [0,1,2]
206206
> >TypeError: 'tuple' object does not support item assignment
207207
> > ~~~
208208
> > {: .output}
209-
> {: .solution}
209+
> {: .solution} -->
210210
{: .challenge}
211211
212212
### Assigning Elements of a List or Tuple to New Variables
@@ -393,7 +393,7 @@ for key in numbers2:
393393
>
394394
> Try to reassign the second value of `numbers2` (in the *key value pair*) so that it no longer reads "two" but instead reads "spam and eggs". What does your dictionary look like after you make this change?
395395
>
396-
> > ## Solution
396+
<!-- > > ## Solution
397397
> >
398398
> > ~~~
399399
> > numbers2[2] = 'spam and eggs'
@@ -405,7 +405,7 @@ for key in numbers2:
405405
> >{1: 'one', 2: 'spam and eggs', 3: 'three', 4: 'four'}
406406
> > ~~~
407407
> > {: .output}
408-
> {: .solution}
408+
> {: .solution} -->
409409
{: .challenge}
410410
411411
It is important to note that dictionaries in Python 3.6 or greater are insertion _ordered_ and preserve the

_includes/lesson_footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="row">
33
<div class="col-md-6" align="left">
44
<h5>
5-
Content adapted by T. Heath; Copyright &copy; 2018 <a href="{{ site.dc_site }}">Data Carpentry</a> & <a href="{{ site.swc_site }}">Software Carpentry</a>
5+
Content adapted by T. Heath; Copyright &copy; 2021 <a href="{{ site.dc_site }}">Data Carpentry</a> & <a href="{{ site.swc_site }}">Software Carpentry</a>
66
<!--
77
{% if site.carpentry == "swc" %}<a href="{{ site.swc_site }}">Software Carpentry Foundation</a>{% endif %}
88
{% if site.carpentry == "dc" %}<a href="{{ site.dc_site }}">Data Carpentry</a>{% endif %}

fig/jupyter2.png

-6.56 KB
Loading

index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ root: .
55

66
# Welcome to the Python part of the BCB546 course!
77

8-
The materials we will work through are a sample of the lessons created for [Data Carpentry](http://www.datacarpentry.org/python-ecology-lesson/00-short-introduction-to-Python/) and [Software Carpentry](http://swcarpentry.github.io/python-novice-inflammation).
8+
The materials we will work through are a sample of the lessons created for [Data Carpentry](https://datacarpentry.org/python-ecology-lesson/) and [Software Carpentry](http://swcarpentry.github.io/python-novice-inflammation).
99
The goal of this section is to demonstrate the utility of Python for working with biological data.
1010

1111
## Why Python?
@@ -36,7 +36,7 @@ More details about the files we'll use and where to download them are available
3636
{: .prereq}
3737

3838
### Getting Started
39-
To get started with installing Python, follow the directions given in the [Python section of the course Software page](https://eeob-biodata.github.io/EEOB-BCB-546X/software#python).
39+
To get started with installing Python, follow the directions given in the [Python section of the course Software page](https://eeob-biodata.github.io/EEOB-BCB-546/software#python).
4040
In addition to installing Python on your own computer, you will also need to download the data files used in the tutorials. Details for doing this are found in the [Setup](setup/) page.
4141

4242
### Format

setup.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ You need to download some files to follow this lesson:
88

99
1. Make a new folder in your Desktop (or anywhere else you like) called `python-bcb546`.
1010
2. Download the following files into this folder:
11-
3. [surveys.csv](https://github.com/EEOB-BioData/BCB546X-Fall2019/raw/master/course-files/python/surveys.csv)
12-
4. [species.csv](https://github.com/EEOB-BioData/BCB546X-Fall2019/raw/master/course-files/python/species.csv)
13-
5. [surveys_complete.csv](https://github.com/EEOB-BioData/BCB546X-Fall2019/raw/master/course-files/python/surveys_complete.csv)
11+
3. [surveys.csv](https://github.com/EEOB-BioData/BCB546-Spring2021/raw/main/course-files/python/surveys.csv)
12+
4. [species.csv](https://github.com/EEOB-BioData/BCB546-Spring2021/raw/main/course-files/python/species.csv)
13+
5. [surveys_complete.csv](https://github.com/EEOB-BioData/BCB546-Spring2021/raw/main/course-files/python/surveys_complete.csv)
1414

15-
Or, you can pull from the [course repository](https://github.com/EEOB-BioData/BCB546X-Fall2019) and change to the directory containing the data files:
16-
1. `cd BCB546X-Fall2019`
17-
2. `git pull origin master`
15+
Or, you can pull from the [course repository](https://github.com/EEOB-BioData/BCB546-Spring2021) and change to the directory containing the data files:
16+
1. `cd BCB546-Spring2021`
17+
2. `git pull origin main`
1818
3. `cd course-files/python`
1919

2020

2121
Or if you haven't yet cloned the course repository:
22-
1. `git clone git@github.com:EEOB-BioData/BCB546X-Fall2019.git`
23-
2. `cd BCB546X-Fall2019/course-files/python`
22+
1. `git clone git@github.com:EEOB-BioData/BCB546-Spring2021.git`
23+
2. `cd BCB546-Spring2021/course-files/python`
2424

2525

2626

0 commit comments

Comments
 (0)