Merge branch 'master' of https://github.com/kthyng/python4geosciences

Author: kthyng

scripts/README.txt

@@ -1,5 +1,7 @@
 # Set up for class
 
+Many of these steps can be run together in run.sh.
+
 ## Set up student accounts
 
 1. Download class rosters for all sections into csv files that are put into this directory.
@@ -11,7 +13,7 @@
 
 ## Set up nbgrader_config.py
 
-1. Generate student entries for the file with `make_student_dict_entries.py`.
+1. Generate student entries for the file with `make_student_dict_entries.py` and put into config file.
 
 
 ## Disperse materials to students

scripts/disperse_python4geosciences_file.sh

@@ -2,11 +2,13 @@
 # how to run:
 # disperse_python4geosciences_file.sh [filename]
 
-file=$1
-echo copyng $file
+users1=$1
+users2=$2
+file=$3
 
-for id in `cat /root/pgs2017_g /root/pgs2017_ug` ; do
-    cp -rf $file /d2/home/$id/notebooks/python4geosciences/materials ;
-    chown $id:pythonspring2017 /d2/home/$id/notebooks/python4geosciences/materials/${file##*/} ;
+for id in `cat $users1 $users2` ; do
+    cp -rf $file /home/$id/python4geosciences/materials ;
+    # removes path up to the file itself
+    chown $id:$id /home/$id/python4geosciences/materials/${file##*/} ;
     echo copied $file for $id
 done

scripts/disperse_python4geosciences_materials.sh

@@ -1,11 +1,10 @@
 #!/bin/bash
 
-for id in `cat /root/pgs2017_g /root/pgs2017_ug` ; do 
-    mkdir /d2/home/$id/notebooks ; 
-    cp -rf python4geosciences /d2/home/$id/notebooks ; 
-    rm -rf /d2/home/$id/notebooks/python4geosciences/.git
-    chown -R $id:pythonspring2017 /d2/home/$id/notebooks ; 
-done
-
-
+users1=$1
+users2=$2
 
+for id in `cat $users1 $users2` ; do
+    cp -rf ../../python4geosciences /home/$id ;
+    rm -rf /home/$id/python4geosciences/.git
+    chown -R $id:$id /home/$id ;
+done

scripts/email_passwords.py

@@ -1,11 +1,16 @@
-f = open('passwords')
+import os
+
+fuug = open('users_undergrads.txt')
+fug = open('users_grads.txt')
+fpug = open('passwds_undergrads.txt')
+fpg = open('passwds_grads.txt')
 
 text = '''
 Python for Geosciences
 
 You will need a username and password to log into the computer where we will view the class materials and work on the homework assignments. The jupyter server is:
 
-    http://redfish.tamu.edu:8000
+    http://redfish.geos.tamu.edu:8000
 
 Your username (same as TAMU NetID) and password are:
 
@@ -14,10 +19,18 @@
 
 See you in class,
 
-Rob
+Dr. Thyng
 '''
 
-for line in f.readlines():
-    username, password = line.split()
-    print('{username}@email.tamu.edu'.format(username=username))
-    print(text.format(username=username, password=password))
+subject = 'Python class username and password'
+
+for user, passwd in zip(fuug.readlines(), fpug.readlines()):
+
+    # remove new line at end
+    user = user.split()[0]
+    passwd = passwd.split()[0]
+    email = '{username}@email.tamu.edu'.format(username=user)
+    message = text.format(username=user, password=passwd)
+    # # -s is subject, email address is who to send to, after <<< is body of message
+    command = 'mail -s "' + subject + '" ' + email + ' <<< "' + message + '"'
+    os.system(command)

scripts/make_passwd.py

@@ -1,3 +1,13 @@
+'''
+Generate passwords
+
+Example usage:
+wc -l < users_undergrads.txt  # count number of users
+python3 make_passwd.py --passwords [number of users] > passwds_undergrads.txt
+wc -l < users_grads.txt  # count number of users
+python3 make_passwd.py --passwords [number of users] > passwds_grads.txt
+'''
+
 from random import shuffle
 import argparse
 
@@ -9,8 +19,10 @@
 
 args = parser.parse_args()
 
+
+
 # load in list of words
-f = open('../words.txt')
+f = open('../../wordlist.txt')
 words = f.readlines()
 f.close()
 

scripts/make_student_dict_entries.py

@@ -1,7 +1,15 @@
+'''
+Usage:
+python3 make_student_dict_entries.py undergrads.csv
+python3 make_student_dict_entries.py grads-600.csv
+python3 make_student_dict_entries.py grads-650.csv
+'''
+
+
 import pandas as pd
 import argparse
 
-parser = argparse.ArgumentParser(description='Generate random passwords based on english words.')
+parser = argparse.ArgumentParser(description='make student entries for nbgrader_config.py file.')
 parser.add_argument('filename',
                     help='Name of student csv file to parse')
 args = parser.parse_args()

scripts/make_user_account.sh

@@ -1,6 +1,25 @@
 #!/bin/bash
 
+users1=$1
+users2=$2
+pass1=$3
+pass2=$4
 
-for id in `cat /root/pgs2017_g /root/pgs2017_ug` ; do
-    adduser $id -p $password;
+# put users into an array
+users=()
+for id in `cat $users1 $users2` ; do
+    users+=("$id")
+done
+# echo "${users[@]}"
+
+# put passwords into an array
+for pass in `cat $pass1 $pass2` ; do
+    pass+=("$pass")
+done
+
+for ((i=0;i<${#users[@]};i++)); do
+    # echo $i
+    # echo ${users[$i]}
+    # echo ${pass[$i]}
+    sudo adduser ${users[i]} -p ${pass[i]};
 done

scripts/parse_username.py

@@ -1,6 +1,10 @@
 '''
+Make user names
+
 Example usage:
-python parse_username.py undergrads.csv
+python3 parse_username.py undergrads.csv > users_undergrads.txt
+python3 parse_username.py grads-600.csv > users_grads.txt
+python3 parse_username.py grads-650.csv >> users_grads.txt
 '''
 
 import pandas as pd
@@ -18,4 +22,4 @@
     assert domain=='email.tamu.edu', 'email needs to be TAMU netID'
     print(username)
 
-# copy and paste into a file by undergrad vs. grad to be used in disperse_...
+# redirect into a file by undergrad vs. grad to be used in disperse_...

scripts/remove_users.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Oops, need to remove the user accounts I made
+# usage: ./remove_users.sh users_undergrads.txt users_grads.txt
+# also good for end of class
+
+users1=$1
+users2=$2
+
+for id in `cat $users1 $users2` ; do
+    sudo userdel -r $id
+done

scripts/run.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# call your roster files undergrads.csv, grads-600.csv, and grads-650.csv.
+ugroster=undergrads.csv
+groster1=grads-600.csv
+groster2=grads-650.csv
+
+# Save usernames
+python3 parse_username.py $ugroster > users_undergrads.txt
+python3 parse_username.py $groster1 > users_grads.txt
+python3 parse_username.py $groster2 >> users_grads.txt
+
+# Save passwords
+num="$(wc -l < users_undergrads.txt)"  # count number of users
+python3 make_passwd.py --passwords $num > passwds_undergrads.txt
+num="$(wc -l < users_grads.txt)"  # count number of users
+python3 make_passwd.py --passwords $num > passwds_grads.txt
+
+# Make user accounts
+ ./make_user_account.sh users_undergrads.txt users_grads.txt passwds_undergrads.txt passwds_grads.txt
+
+# If you mess it up and have to start over, remove user accounts:
+# ./remove_users.sh users_undergrads.txt users_grads.txt
+
+# Email students their username and password with `email_passwords.py`.
+python3 email_passwords.py
+
+# Make student entries to put into nbgrader file
+python3 make_student_dict_entries.py $ugroster
+python3 make_student_dict_entries.py $groster1
+python3 make_student_dict_entries.py $groster2
+
+# disperse class materials to students
+sudo ./disperse_python4geosciences_materials.sh users_undergrads.txt users_grads.txt
+
+# Later, disperse another file
+# sudo ./disperse_python4geosciences_file.sh users_undergrads.txt users_grads.txt [filename]