Merge pull request #40 from Morpheus636/main

Release V0.1.1
Morpheus636 · May 15, 2022 · aad8bf6 · aad8bf6
2 parents 033ac34 + 802a6db
commit aad8bf6
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 149 deletions.
diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Setup Poetry
         uses: Gr1N/setup-poetry@v7

diff --git a/.github/workflows/code_analysis_pull.yml b/.github/workflows/code_analysis_pull.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Setup Poetry
         uses: Gr1N/setup-poetry@v7
@@ -30,7 +30,7 @@ jobs:
         run: poetry run isort
 
       - name: Black (Code Formatter)
-        run: poetry run black .
+        run: poetry run black src/ tests/
 
       - name: Check for changes
         id: changes

diff --git a/.github/workflows/code_analysis_push.yml b/.github/workflows/code_analysis_push.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Setup Poetry
         uses: Gr1N/setup-poetry@v7
@@ -29,7 +29,7 @@ jobs:
         run: poetry run isort
 
       - name: Black (Code Formatter)
-        run: poetry run black .
+        run: poetry run black src/ tests/
 
       - name: Check for changes
         id: changes

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v1
         with:
-          python-version: 3.9
+          python-version: "3.10"
 
       - name: Setup Poetry
         uses: Gr1N/setup-poetry@v7

diff --git a/.gitignore b/.gitignore
@@ -138,4 +138,5 @@ dmypy.json
 cython_debug/
 
 # Project specific
-/redownloads
+/redownloads
+.idea/
diff --git a/Makefile b/Makefile
@@ -1,3 +1,3 @@
 build:
 	poetry run python build_system/update_version.py
-	poetry run pyinstaller --hidden-import certifi --onefile ./src/redownload_cli.py --name redownload-cli
+	poetry run pyinstaller --onefile ./src/redownload_cli.py --name redownload-cli
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing
+Contribution documentation for all Morpheus636 projects can be found at https://docs.morpheus636.com/contributing.
+
+## Docs specific to this project:
+- This project uses a [Semantic Versioning Workflow](https://docs.morpheus636.com/contributing/semantic-versioning-workflow)
+- This project is written in Python. Python-specific contribution docs can be found [here](https://docs.morpheus636.com/contributing/python)
+- This project contains some scripts to make development easier. They are documented [here](scripts.md)
diff --git a/docs/INDEX.md b/docs/INDEX.md
diff --git a/docs/README.md b/docs/README.md
@@ -20,16 +20,5 @@ To submit a Bug Report or Feature Request, please open a [GitHub Issue](https://
 To ask a question or get support, you can join my [Discord Server](https://discord.morpheus636.com) or ask in the Redownload section of my 
 [Forums](https://forums.morpheus636.com)
 
-## Documentation
-To view all of the available documentation for this project, please see the [Documents Index](INDEX.md)
-This includes information on getting started, the development environment, and more.
-
 ## Contributing
-If you'd like to work on developing Redownload, you can start by doing the following:
-
-1. Fork this repository
-2. git clone your fork to your development machine
-3. Set up your [Development Environment](development.md)
-4. Pick up a ticket labeled help wanted as outlined in the [tickets](tickets.md) documentation
-5. Work on implementing the feature or bugfix in your fork
-6. Open a Pull Request back into this repository's main branch.
+To contribute to this project, view the Contribution Docs found in [CONTRIBUTING.md](CONTRIBUTING.md)
diff --git a/docs/development.md b/docs/development.md
diff --git a/docs/tickets.md b/docs/tickets.md
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -5,7 +5,7 @@ description = ""
 authors = ["Josh Levin (Morpheus636) <[email protected]>"]
 
 [tool.poetry.dependencies]
-python = "^3.9, <3.10"
+python = "^3.10, <3.11"
 beautifulsoup4 = "^4.10.0"
 requests = "^2.27.1"
 certifi = "^2021.10.8"

diff --git a/src/redownload/web_parsing.py b/src/redownload/web_parsing.py
@@ -3,6 +3,7 @@
 import urllib.request
 
 import bs4
+import certifi  # To fix SSL issue from issue #31
 
 from . import exceptions
 
@@ -13,7 +14,7 @@ def html_from_url(url: str) -> bs4.BeautifulSoup:
     :param url: The URL to download HTML from, in a string.
     :return: BeautifulSoup object extracted from the url.
     """
-    request = urllib.request.urlopen(urllib.request.Request(url, headers={"User-Agent": "Mozilla"}))
+    request = urllib.request.urlopen(urllib.request.Request(url, headers={"User-Agent": "Mozilla"}), cafile=certifi.where())
     html_doc = request.read()
     html_soup = bs4.BeautifulSoup(html_doc, features="html.parser")
     return html_soup