Lecture 2

This class covers basics of HTML and CSS, using bottle.py as the framework.

To install bottle, you can do:

• If you use anaconda, then (see here): conda install -c conda-forge bottle
• If you use standard Python, you can do: pip install bottle

You can find here the documentation for bottle.

To get the code we are covering in class, do as follows.

1. Get the repository

If you use HTTPS to access bitbucket:

git clone https://luca_de_alfaro@bitbucket.org/luca_de_alfaro/bottle_intro.git

If you use ssh (I recommend ssh if you are going to host there your private repositories):

git clone git@bitbucket.org:luca_de_alfaro/bottle_intro.git

2. Check out the correct branch.

git checkout fall-2018

I updated this to the status at the end of the class. If you look at the history of commits, you can see the code we developed during class.

3. Stay up to date.

To fetch the new code:

git fetch

To go to a particular branch:

git checkout <branch>

To start your own branch:

git checkout -b my-branch

To merge another branch into your own:

git checkout my-branch # if needed

git merge other-branch