merge upstream master

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,37 @@
+---
+name: bug report
+about: Create a report to a bug or regression
+title: 'bug: '
+labels: untriaged
+assignees: ''
+
+---
+
+**Describe the bug**
+
+A clear and concise description of what the bug is. [e.g. "`bleach.clean` does not escape script tag contents"]
+
+** python and bleach versions (please complete the following information):**
+
+ - Python Version: [e.g. 3.8.2]
+ - Bleach Version: [e.g. 3.2.0]
+
+**To Reproduce**
+
+Steps to reproduce the behavior:
+
+[e.g. ```python
+>>> bleach.clean("><script>alert("XSS")</script>&")
+"><script>alert("XSS")</script>&"
+```]
+
+**Expected behavior**
+
+[e.g. ```python
+>>> bleach.clean("><script>alert("XSS")</script>&")
+'&gt;"&gt;&lt;script&gt;alert("XSS")&lt;/script&gt;&amp;'
+```]
+
+**Additional context**
+
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,31 @@
+---
+name: feature request
+about: Suggest an idea for this project
+title: 'feature: '
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+
+A clear and concise description of what you want to happen. 
+
+Does this feature modify an existing method e.g. `clean`, `linkify`?
+
+If you have an implementation in mind include an example call and output [e.g. ```python
+>>> bleach.clean(always_error=True)
+Exception("always raise exception enabled")
+```]
+
+**Describe alternatives you've considered**
+
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+
+Add any other context or screenshots about the feature request here.

.github/workflows/lint.yml

@@ -0,0 +1,40 @@
+name: Lint
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.8]
+        os: [ubuntu-latest]
+        mode: [lint, vendorverify, docs]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.cache/pip
+          key:
+            ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py')
+            }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python-version }}-
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip setuptools>=18.5
+          python -m pip install -r requirements-dev.txt
+
+      - name: Tests
+        shell: bash
+        run: ./scripts/run_tests.sh ${{ matrix.mode }}

.github/workflows/test.yml

@@ -0,0 +1,44 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: [3.6, 3.7, 3.8, pypy3]
+        os: [ubuntu-18.04, ubuntu-16.04, macos-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Set up Python ${{ matrix.python-version }}
+        uses: actions/setup-python@v2
+        with:
+          python-version: ${{ matrix.python-version }}
+
+      - name: Get pip cache dir
+        id: pip-cache
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ steps.pip-cache.outputs.dir }}
+          key:
+            ${{ matrix.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py')
+            }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.python-version }}-
+
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip setuptools>=18.5
+          python -m pip install -r requirements-dev.txt
+
+      - name: Tests
+        shell: bash
+        run: ./scripts/run_tests.sh

.gitignore

@@ -4,7 +4,16 @@ pip-log.txt
 .coverage
 dist
 *.egg-info
-.noseids
 build
 .tox
 docs/_build/
+.cache/
+.eggs/
+.*env*/
+.pytest_cache/
+.python-version
+*~
+*.swp
+__pycache__
+venv/
+.idea/