upstream to update AUTHORS

.github/issue_template.md

@@ -15,4 +15,4 @@
 * Search engine version:
 * Python version:
 * Django version:
-* Haystack version:
+* Haystack version:

.github/pull_request_template.md

@@ -1,3 +1,3 @@
 # Hey, thanks for contributing to Haystack. Please review [the contributor guidelines](https://django-haystack.readthedocs.io/en/latest/contributing.html) and confirm that [the tests pass](https://django-haystack.readthedocs.io/en/latest/running_tests.html) with at least one search engine.
 
-# Once your pull request has been submitted, the full test suite will be executed on https://travis-ci.org/django-haystack/django-haystack/pull_requests. Pull requests with passing tests are far more likely to be reviewed and merged.
+# Once your pull request has been submitted, the full test suite will be executed on https://github.com/django-haystack/django-haystack/actions/workflows/test.yml. Pull requests with passing tests are far more likely to be reviewed and merged.

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,28 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master, ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 6 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: python
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/docs.yml

@@ -0,0 +1,17 @@
+name: Build docs
+
+on: [pull_request, push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: pip install sphinx
+    - name: Build docs
+      run: cd docs && make html

.github/workflows/flake8.yml

@@ -0,0 +1,17 @@
+name: flake8
+
+on: [pull_request, push]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Install tools
+      run: pip install flake8 flake8-assertive flake8-bugbear flake8-builtins flake8-comprehensions flake8-logging-format
+    - name: Run flake8
+      run: flake8 example_project haystack

.github/workflows/publish.yml

@@ -0,0 +1,22 @@
+name: Publish
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    - name: Install dependencies
+      run: python -m pip install --upgrade pip setuptools twine wheel
+    - name: Build package
+      run: python setup.py sdist bdist_wheel
+    - name: Publish to PyPI
+      run: twine upload --non-interactive dist/*

.github/workflows/test.yml

@@ -0,0 +1,58 @@
+name: Test
+
+on: [pull_request, push]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        django-version: [2.2, 3.1, 3.2]
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        elastic-version: [1.7, 2.4, 5.5, '7.13.1']
+        include:
+          - django-version: 2.2
+            python-version: 3.5
+            elastic-version: 1.7
+          - django-version: 2.2
+            python-version: 3.5
+            elastic-version: 2.4
+          - django-version: 2.2
+            python-version: 3.5
+            elastic-version: 5.5
+          - django-version: 2.2
+            python-version: 3.5
+            elastic-version: '7.13.1'
+    services:
+      elastic:
+        image: elasticsearch:${{ matrix.elastic-version }}
+        env:
+          discovery.type: "single-node"
+        options: >-
+          --health-cmd "curl http://localhost:9200/_cluster/health"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 10
+        ports:
+          - 9200:9200
+      solr:
+        image: solr:6
+        ports:
+          - 9001:9001
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install system dependencies
+      run: sudo apt install --no-install-recommends -y gdal-bin
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        pip install coverage requests
+        pip install django==${{ matrix.django-version }} elasticsearch==${{ matrix.elastic-version }}
+        python setup.py clean build install
+    - name: Run test
+      run: coverage run setup.py test

.pre-commit-config.yaml

@@ -0,0 +1,33 @@
+exclude: ".*/vendor/.*"
+repos:
+    - repo: https://github.com/PyCQA/isort
+      rev: 5.9.3
+      hooks:
+          - id: isort
+    - repo: https://github.com/psf/black
+      rev: 21.8b0
+      hooks:
+          - id: black
+    - repo: https://github.com/pre-commit/pre-commit-hooks
+      rev: v4.0.1
+      hooks:
+          - id: check-added-large-files
+            args: ["--maxkb=128"]
+          - id: check-ast
+          - id: check-byte-order-marker
+          - id: check-case-conflict
+          - id: check-docstring-first
+          - id: check-executables-have-shebangs
+          - id: check-json
+          - id: check-merge-conflict
+          - id: check-symlinks
+          - id: check-xml
+          - id: check-yaml
+          - id: debug-statements
+          - id: detect-private-key
+          - id: end-of-file-fixer
+          - id: mixed-line-ending
+            args: ["--fix=lf"]
+          - id: pretty-format-json
+            args: ["--autofix", "--no-sort-keys", "--indent=4"]
+          - id: trailing-whitespace

CONTRIBUTING.md

@@ -25,8 +25,8 @@ So you've found a bug or have a great idea for a feature. Here's the steps you
 should take to help get it added/fixed in Haystack:
 
 -   First, check to see if there's an existing issue/pull request for the
-    bug/feature. All issues are at https://github.com/toastdriven/django-haystack/issues
-    and pull reqs are at https://github.com/toastdriven/django-haystack/pulls.
+    bug/feature. All issues are at https://github.com/django-haystack/django-haystack/issues
+    and pull reqs are at https://github.com/django-haystack/django-haystack/pulls.
 -   If there isn't one there, please file an issue. The ideal report includes:
     -   A description of the problem/suggestion.
     -   How to recreate the bug.

README.rst

@@ -1,3 +1,18 @@
+.. image:: https://github.com/django-haystack/django-haystack/actions/workflows/test.yml/badge.svg
+      :target: https://github.com/django-haystack/django-haystack/actions/workflows/test.yml
+.. image:: https://img.shields.io/pypi/v/django-haystack.svg
+      :target: https://pypi.python.org/pypi/django-haystack/
+.. image:: https://img.shields.io/pypi/pyversions/django-haystack.svg
+      :target: https://pypi.python.org/pypi/django-haystack/
+.. image:: https://img.shields.io/pypi/dm/django-haystack.svg
+      :target: https://pypi.python.org/pypi/django-haystack/
+.. image:: https://readthedocs.org/projects/django-haystack/badge/
+      :target: https://django-haystack.readthedocs.io/
+.. image:: https://img.shields.io/badge/code%20style-black-000.svg
+      :target: https://github.com/psf/black
+.. image:: https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336
+      :target: https://pycqa.github.io/isort/
+
 ========
 Haystack
 ========
@@ -11,7 +26,7 @@ Elasticsearch_, Whoosh_, Xapian_, etc.) without having to modify your code.
 
 .. _Solr: http://lucene.apache.org/solr/
 .. _Elasticsearch: https://www.elastic.co/products/elasticsearch
-.. _Whoosh: https://bitbucket.org/mchaput/whoosh/
+.. _Whoosh: https://github.com/mchaput/whoosh/
 .. _Xapian: http://xapian.org/
 
 Haystack is BSD licensed, plays nicely with third-party app without needing to
@@ -39,18 +54,12 @@ Documentation
 
 See the `changelog <docs/changelog.rst>`_
 
-Build Status
-============
-
-.. image:: https://travis-ci.org/django-haystack/django-haystack.svg?branch=master
-   :target: https://travis-ci.org/django-haystack/django-haystack
-
 Requirements
 ============
 
 Haystack has a relatively easily-met set of requirements.
 
-* Python 2.7+ or Python 3.3+
+* Python 3.5+
 * A supported version of Django: https://www.djangoproject.com/download/#supported-versions
 
 Additionally, each backend has its own requirements. You should refer to