Fix merge conflicts

Author: somacdivad

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/python:3.6
+      - image: circleci/python:3.8
 
     working_directory: ~/repo
 
@@ -21,7 +21,7 @@ jobs:
           - v1-dependencies-
 
       - run:
-          name: install dependencies
+          name: Install dependencies
           command: |
             python3 -m venv venv
             . venv/bin/activate

.dependabot/config.yml

@@ -0,0 +1,5 @@
+version: 1
+update_configs:
+  - package_manager: "python"
+    directory: "/requirements.txt"
+    update_schedule: "monthly"

arcade-a-primer/README.md

@@ -1 +1 @@
-Source files supporting the **Arcade - A Modern Python Game Framework** article
+Source files supporting the [Arcade: A Primer on the Python Game Framework](https://realpython.com/arcade-python-game-framework/) article on [Real Python](https://realpython.com/).

arcade-a-primer/arcade_game.py

@@ -40,7 +40,7 @@ class SpaceShooter(arcade.Window):
     Collisions end the game
     """
 
-    def __init__(self, width, height, title):
+    def __init__(self, width: int, height: int, title: str):
         """Initialize the game
         """
         super().__init__(width, height, title)
@@ -131,7 +131,7 @@ def add_cloud(self, delta_time: float):
         self.clouds_list.append(cloud)
         self.all_sprites.append(cloud)
 
-    def on_key_press(self, symbol, modifiers):
+    def on_key_press(self, symbol: int, modifiers: int):
         """Handle user keyboard input
         Q: Quit the game
         P: Pause the game

build-a-web-scraper/.gitignore

@@ -0,0 +1,2 @@
+venv
+.ipynb*

build-a-web-scraper/01_inspect.ipynb

@@ -0,0 +1,112 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "# Your Turn: Build A Pipeline\n",
+    "\n",
+    "- Combine Your Knowledge of the Website, `requests` and `bs4`\n",
+    "- Automate Your Scraping Process Across Multiple Pages\n",
+    "- Generalize Your Code For Varying Searches\n",
+    "- Target & Save Specific Information You Want"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Your Tasks:\n",
+    "\n",
+    "- Scrape the first 100 available search results\n",
+    "- Generalize your code to allow searching for different locations/jobs\n",
+    "- Pick out information about the URL, job title, and job location\n",
+    "- Save the results to a file"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "import requests\n",
+    "from bs4 import BeautifulSoup"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Part 1: Inspect\n",
+    "\n",
+    "- How do the URLs change when you navigate to the next results page?\n",
+    "- How do the URLs change when you use a different location and/or job title search?\n",
+    "- Which HTML elements contain the link, title, and location of each job?"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Part 2: Scrape\n",
+    "\n",
+    "- Build the code to fetch the first 100 search results. This means you will need to automatically navigate to multiple results pages\n",
+    "- Write functions that allow you to specify the job title, location, and amount of results as arguments"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "### Part 3: Parse\n",
+    "\n",
+    "- Sieve through your HTML soup to pick out only the job title, link, and location\n",
+    "- Format the results in a readable format (e.g. JSON)\n",
+    "- Save the results to a file"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Python 3",
+   "language": "python",
+   "name": "python3"
+  },
+  "language_info": {
+   "codemirror_mode": {
+    "name": "ipython",
+    "version": 3
+   },
+   "file_extension": ".py",
+   "mimetype": "text/x-python",
+   "name": "python",
+   "nbconvert_exporter": "python",
+   "pygments_lexer": "ipython3",
+   "version": "3.8.0"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 4
+}