Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions .github/workflows/static.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# Simple workflow for deploying static content to GitHub Pages
name: Deploy static content to Pages

on:
# Runs on pushes targeting the default branch
push:
branches: ["main"]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
concurrency:
group: "pages"
cancel-in-progress: false

jobs:
# Single deploy job since we're just deploying
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Pages
uses: actions/configure-pages@v5
- name: Upload artifact
uses: actions/upload-pages-artifact@v3
with:
# Upload entire repository
path: './03_instructional_team/githubpages'
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
<!-- Note to self: This is for the Scaling to Production course -->
# Git Advanced Homework

# Git Homework 2

## Short answer
1. What makes a good Git commit message? Write your answer in the Google Doc
**Note**: Homework problems are not assessed and are provided for your own personal practice. Feel free to discuss these with your peers and learning support during work sessions!

## Tasks
The `DSI/git_homework-2` repository contains a short Python script that
The `dtxe/DSI_git_assignment` repository contains a short Python script that
loads the TTC Bus Delay dataset, computes the average delay by route, then
plots the average delay as a histogram.

s
1. Clone this repository: https://github.com/dtxe/DSI_git_assignment
* `git clone`

Expand All @@ -21,7 +18,6 @@ get this code working by merging the fixes.
1. Check the current status and commit history
* `git status` and `git log`
2. Merge the `bugfix1` branch into the main branch
3. 📸 Take a screenshot of your terminal output

### Task 2
We've also been working on an additional feature in a separate branch.
Expand All @@ -30,17 +26,12 @@ This allows us to aggregate the data by any arbitrary column in the DataFrame, n
Let's merge this feature in.

1. Merge the `feature1` branch into the main branch.
2. 📸 Take a screenshot of your terminal output

### Task 3
Uh oh! It looks like there's a merge conflict between the bugfix and the new feature!

1. Resolve the merge conflict in your choice of editor
* We suggest using VSCode!
2. Complete the merge after fixing the conflict.
3. 📸 Take a screenshot of your terminal output
4. Copy and paste the new Analyze.py file into the Google Doc


## Submission
* Submit your screenshots and the contents of the new Analyze.py file in a Google Doc inside your submission folder
5 changes: 5 additions & 0 deletions 02_activities/homework/git_basics.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Git Basic Practice Problems

Load the basic practice problems in your browser here: https://uoft-dsi.github.io/git/interactive_problems.html#git_basics

**Note**: Homework problems are not assessed and are provided for your own personal practice. Feel free to discuss these with your peers and learning support during work sessions!
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
# Git Homework 1
# Git Basics

**Note**: Homework problems are not assessed and are provided for your own personal practice. Feel free to discuss these with your peers and learning support during work sessions!

## Tasks
### Task 1
Expand All @@ -8,26 +10,23 @@
4. Using the git command line, add this file to staging, then commit the file to your repository with a suitable commit message.
* `git add <filename>` then `git commit`
5. Write a suitable commit message and finalize your commit
6. 📸 Take a screenshot of your terminal output
8. Show the commit history
* `git log`
9. 📸 Take a screenshot of your terminal output


### Task 2
1. Create a new public repository on GitHub
2. Add your GitHub repository as a remote for your local `githomework1` repository
* `git remote add origin <url>`
3. Push your local `githomework1` repository to GitHub
4. Include your repository URL in your submission


### Task 3
1. Create a new branch called `playing-with-bash`
2. Create 5 empty files with the names up to you
3. Use `echo` into the 5 empty files a few sentences about anything
2. Create 5 text files with the names up to you, and with placeholder contents
4. Stage, commit and push your work on GitHub
5. Open up a pull request

### Submission

1. When you are done, please commit your changes, and push it to GitHub.
2. Open up a pull request and add your Learning Support Person as a reviewer. You may need to add them to your repository.
### Task 4
1. Explore your repository on GitHub and check that all your files and commit messages are here.
* If not, did you push all your branches?
Loading