From 4617c0fb3d13d362d6db8aa39ac121298fc5b374 Mon Sep 17 00:00:00 2001
From: Tom van Woudenberg <t.r.vanwoudenberg@tudelft.nl>
Date: Wed, 25 Sep 2024 08:52:31 +0200
Subject: [PATCH] Update PA1.5
---
content/week_1_5/PA/README.md | 19 +++++++------------
.../week_1_5/PA/auxiliary_files/convert.py | 8 --------
content/week_1_5/PA/crossword.md | 7 +++++++
3 files changed, 14 insertions(+), 20 deletions(-)
delete mode 100644 content/week_1_5/PA/auxiliary_files/convert.py
diff --git a/content/week_1_5/PA/README.md b/content/week_1_5/PA/README.md
index a5eaf4ca..3b54592c 100644
--- a/content/week_1_5/PA/README.md
+++ b/content/week_1_5/PA/README.md
@@ -5,22 +5,17 @@
You can access the assignment with this link: [classroom.github.com/a/-](https://classroom.github.com/a/-)
-This PA consists of 3 parts:
+This PA consists of 4 parts:
1. Read the chapter in [Programming for Week 1.5](https://mude.citg.tudelft.nl/2024/book/programming/week_1_5.html) about branching, forking, pull requests and merge conflicts
-2. Crossword puzzle in this repository with branches and merging into main
-3. Contribute to the Ice repo from your own fork
+2. Crossword puzzle in `crossword.md` this repository with branches and merging into main.
+3. Python list comprehension, plt.bar() and asserts in `... .ipynb` in this repository`
+4. Contribute to the ice repo from your own fork
You will pass this PA if:
1. You successfully merged a pull request from your own branch
-2. You successfully created a pull request to the ICE repo.
+2. You successfully performed the tasks in ...
+3. You successfully created a pull request to the ice repo.
You can verify that you passed the by looking for the green circle in this repository. It runs automatically just like last week when you uploaded your notebook.
-For the Ice repository, a green circle should emerge in the pull request you make to the Ice repo.
-
-## Part 2: Crossword puzzle
-
-1. Fill in some words replacing the `-` in `crossword.md` and commit to a separate branch as explained in the book. Tip for editing the crossword puzzle in `crossword.md`: select `no wrap`: 
-2. Create a pull request, eventually solve merge conflicts and merge your changes into main
-3. Eventually repeat that for multiple words on separate branches. Do you notice when merge conflicts appear?
-
+For the ice repository, a green circle should emerge in the pull request you make to the ice repo.
diff --git a/content/week_1_5/PA/auxiliary_files/convert.py b/content/week_1_5/PA/auxiliary_files/convert.py
deleted file mode 100644
index 07dc9991..00000000
--- a/content/week_1_5/PA/auxiliary_files/convert.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import markdown
-
-with open('crossword.md', 'r') as f:
- text = f.read()
- html = markdown.markdown(text,extensions=['markdown.extensions.tables','sane_lists'])
-
-with open('auxiliary_files/crossword.html', 'w') as f:
- f.write(html)
\ No newline at end of file
diff --git a/content/week_1_5/PA/crossword.md b/content/week_1_5/PA/crossword.md
index 0e8b4e10..e405a2a7 100644
--- a/content/week_1_5/PA/crossword.md
+++ b/content/week_1_5/PA/crossword.md
@@ -1,3 +1,10 @@
+## Part 2: Crossword puzzle
+
+1. Fill in some words replacing the `-` in this file `crossword.md` and commit to a separate branch as explained in the book. Tip for editing the crossword puzzle in `crossword.md`: select `no wrap`: 
+2. Create a pull request, eventually solve merge conflicts and merge your changes into main
+3. Eventually repeat that for multiple words on separate branches. Do you notice when merge conflicts appear?
+
+
| |🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|🔠🔢|
| :--------------------: |:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|:-----:|
| 🔠<br>🔢 | | | | | | | | | | | | | | | | | | | | | | | | | | | (1) -| |
--
GitLab