Merge branch 'main' into ci/macos-python36

.codecov.yml

@@ -3,3 +3,6 @@ coverage:
     project:
       default:
         target: 90%
+    patch:
+      default:
+        target: 80%

.flake8

@@ -0,0 +1,3 @@
+[flake8]
+max-line-length = 88
+ignore = E501, E203, W503

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,15 +1,15 @@
 **⚠ Pull Requests not made with this template will be automatically closed 🔥**
 
-# Prerequisites
+## Prerequisites
 - [ ] Have you read the documentation on contributing? https://github.com/bee-san/pyWhat/wiki/Adding-your-own-Regex
 
-# Why do we need this pull request?
+## Why do we need this pull request?
 * Explain the _why_ behind your PR. We can see what it does from the code. But _why_ does it do that?
 
-# What [GitHub issues](https://github.com/bee-san/pyWhat/issues) does this fix?
+## What [GitHub issues](https://github.com/bee-san/pyWhat/issues) does this fix?
 * Fixes #10000
 
-# Copy / paste of output
+## Copy / paste of output
 
 Please copy and paste the output of PyWhat with your new addition using an example that tests this addition below:
 

.github/workflows/main.yaml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.6', '3.7', '3.8', '3.9', '3.10']
         os: [ubuntu-latest, windows-latest, macos-latest]
         exclude:
           - os: macos-latest
@@ -19,8 +19,7 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
-    - run: python -m pip install flake8 nox poetry
-    - run: flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+    - run: python -m pip install nox poetry
     - run: python -m nox
       env:
         OS: ${{ matrix.os }}

conftest.py

@@ -0,0 +1,6 @@
+import logging
+
+
+def pytest_configure(config):
+    # Silence Flake8 warnings
+    logging.getLogger("flake8").setLevel(logging.ERROR)

fixtures/file

@@ -95,4 +95,11 @@ b2ced6f5-2542-4f7d-b131-e3ada95d8b75
 
 otpauth://totp/Example:alice@google.com?secret=JBSWY3DPEHPK3PXP&issuer=Example
 
-sshpass -p MyPassw0RD! ssh root@10.0.0.10
+sshpass -p MyPassw0RD! ssh root@10.0.0.10
+
+https://hooks.slack.com/services/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
+
+doi:10.1392/BC1.0
+10.1000/123
+
+a80122b2565c3e26a61cbf58d1d1aad7-us5

noxfile.py

@@ -46,6 +46,7 @@ def tests(session: Session) -> None:
         "pytest-black",
         "pytest-cov",
         "pytest-isort",
+        "pytest-flake8",
         "pytest-mypy",
         "types-requests",
         "types-orjson",

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pywhat"
-version = "4.3.1"
+version = "5.0.0"
 description = "What is that thing?"
 authors = ["Bee <github@skerritt.blog>"]
 license = "MIT"
@@ -14,13 +14,14 @@ rich = ">=9.9,<11.0"
 orjson = {version = "^3.6.1", optional = true}
 
 [tool.poetry.dev-dependencies]
-pytest = "^6.2.4"
-black = {version = "^21.6b0", python = "^3.6.2"} 
-isort = {version = "^5.9.2", python = "^3.6.1"}
-flake8 = "3.8.4"
+pytest = "^6.2.5"
+black = {version = "^21.9b0", python = "^3.6.2"} 
+isort = {version = "^5.9.3", python = "^3.6.1"}
+flake8 = "<4.0"
 requests = "^2.26.0"
 pytest-black = "^0.3.12"
 pytest-isort = "^2.0.0"
+pytest-flake8 = "^1.0.7"
 pytest-mypy = "^0.8.1"
 types-requests = "^2.25.9"
 types-orjson = "^3.6.0"
@@ -49,4 +50,4 @@ line_length = 88
 ignore_missing_imports = true
 
 [tool.pytest.ini_options]
-addopts = "--black --isort --mypy"
+addopts = "--black --isort --flake8 --mypy"