GitButler Integration Commit

This is an integration commit for the virtual branches that GitButler is tracking.

Due to GitButler managing multiple virtual branches, you cannot switch back and
forth between git branches and virtual branches easily. 

If you switch to another branch, GitButler will need to be reinitialized.
If you commit on this branch, GitButler will throw it away.

Here are the branches that are currently applied:
 - develop (refs/gitbutler/develop)
   branch head: 048dbbf
 - Virtual branch (refs/gitbutler/Virtual-branch)

Your previous branch was: refs/heads/develop

The sha for that commit was: 378aa87

For more information about what we're doing here, check out our docs:
https://docs.gitbutler.com/features/virtual-branches/integration-branch

.flake8

@@ -2,4 +2,4 @@
 ignore = E203, E266, E501, W503
 max-line-length = 110
 max-complexity = 18
-select = B,C,E,F,W,T4,B9
+select = B,C,E,F,W,T4,B9

.gitattributes

@@ -114,4 +114,4 @@
 *.pdf  filter=lfs diff=lfs merge=lfs -text
 
 # Disabled
-#docs/**/* -filter=lfs -diff=lfs -merge=lfs -text
+#docs/**/* -filter=lfs -diff=lfs -merge=lfs -text

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: [ cnheider ]
+github: [cnheider]
 patreon: cnheider
 open_collective: cnheider
 ko_fi: cnheider

.github/dependabot.yml

@@ -9,4 +9,3 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
-

.github/workflows/on_push.yml

@@ -6,7 +6,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [3.8]
     steps:
       - uses: actions/checkout@master
       - name: Set up Python 3.8
@@ -20,4 +20,3 @@ jobs:
           pip install -r requirements/requirements_dev.txt
           pip install -r requirements/requirements_docs.txt
       - uses: pything/postdoc@master
-

.github/workflows/on_push_python_package.yaml

@@ -1,15 +1,14 @@
 name: Python package
 
-on: [ push ]
+on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [3.8]
 
     steps:
       - uses: actions/checkout@v1

.github/workflows/pythonpackage.yml

@@ -1,15 +1,14 @@
 name: Python package
 
-on: [ push ]
+on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ 3.8 ]
+        python-version: [3.8]
 
     steps:
       - uses: actions/checkout@v2

.nojekyll

@@ -1 +0,0 @@
-

.pre-commit-config.yaml

@@ -1,32 +1,263 @@
 fail_fast: true
-#exclude: '^exclude'
 repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.15.2
+    hooks:
+      - id: pyupgrade
+        args:
+          - --py38-plus
+          - --keep-runtime-typing
+
   - repo: https://github.com/ambv/black
-    rev: 23.3.0
+    rev: 24.4.0
     hooks:
       - id: black
         language_version: python3.10
-  - repo: local
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v4.0.0-alpha.8
     hooks:
-      - id: pytest-check
-        name: pytest-check
-        entry: pytest
-        language: system
-        pass_filenames: false
-        always_run: true
-  - repo: local
+      - id: prettier
+        types: [yaml]
+
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.16
     hooks:
-      - id: flake8-check1 # stop the build if there are Python syntax errors or undefined names
-        name: flake8-check1
-        entry: flake8 jord --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=*exclude*
-        language: system
-        pass_filenames: false
-        always_run: true
-  - repo: local
+      - id: validate-pyproject
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.9.0
+    hooks:
+      - id: mypy
+        verbose: true
+        #exclude: ^tests/
+        entry: bash -c 'mypy "$@" || true' -- # only print
+        #args: [ --strict ]
+
+  - repo: https://github.com/pycqa/flake8
+    rev: 7.0.0 # pick a git hash / tag to point to
+    hooks:
+      - id: flake8 # stop the build if there are Python syntax errors or undefined names
+        additional_dependencies: [flake8-docstrings]
+        exclude: ^exclude*
+        args:
+          - --count
+          - --select=E9,F63,F7,F82
+          - --show-source
+          - --statistics
+      - id: flake8 # only warn
+        additional_dependencies: [flake8-docstrings]
+        exclude: ^exclude*
+        args:
+          - --count
+          - --exit-zero
+          - --max-complexity=10
+          - --max-line-length=127
+          - --statistics
+
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.6.0 # Use the ref you want to point at
     hooks:
-      - id: flake8-check2  # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        name: flake8-check2
-        entry: flake8 jord --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics --exclude=*exclude*
-        language: system
+      - id: check-added-large-files
+        name: check for added large files
+        description: prevents giant files from being committed.
+        entry: check-added-large-files
+        language: python
+      - id: check-ast
+        name: check python ast
+        description: simply checks whether the files parse as valid python.
+        entry: check-ast
+        language: python
+        types: [python]
+      - id: check-byte-order-marker
+        name: "check BOM - deprecated: use fix-byte-order-marker"
+        description: forbids files which have a utf-8 byte-order marker.
+        entry: check-byte-order-marker
+        language: python
+        types: [text]
+      - id: check-builtin-literals
+        name: check builtin type constructor use
+        description: requires literal syntax when initializing empty or zero python builtin types.
+        entry: check-builtin-literals
+        language: python
+        types: [python]
+      - id: check-case-conflict
+        name: check for case conflicts
+        description: checks for files that would conflict in case-insensitive filesystems.
+        entry: check-case-conflict
+        language: python
+      - id: check-docstring-first
+        name: check docstring is first
+        description: checks a common error of defining a docstring after code.
+        entry: check-docstring-first
+        language: python
+        types: [python]
+      - id: check-executables-have-shebangs
+        name: check that executables have shebangs
+        description: ensures that (non-binary) executables have a shebang.
+        entry: check-executables-have-shebangs
+        language: python
+        types: [text, executable]
+        stages: [commit, push, manual]
+      - id: check-json
+        name: check json
+        description: checks json files for parseable syntax.
+        entry: check-json
+        language: python
+        types: [json]
+      - id: check-shebang-scripts-are-executable
+        name: check that scripts with shebangs are executable
+        description: ensures that (non-binary) files with a shebang are executable.
+        entry: check-shebang-scripts-are-executable
+        language: python
+        types: [text]
+        stages: [commit, push, manual]
+      - id: check-merge-conflict
+        name: check for merge conflicts
+        description: checks for files that contain merge conflict strings.
+        entry: check-merge-conflict
+        language: python
+        types: [text]
+      - id: check-symlinks
+        name: check for broken symlinks
+        description: checks for symlinks which do not point to anything.
+        entry: check-symlinks
+        language: python
+        types: [symlink]
+      - id: check-toml
+        name: check toml
+        description: checks toml files for parseable syntax.
+        entry: check-toml
+        language: python
+        types: [toml]
+      - id: check-vcs-permalinks
+        name: check vcs permalinks
+        description: ensures that links to vcs websites are permalinks.
+        entry: check-vcs-permalinks
+        language: python
+        types: [text]
+      - id: check-xml
+        name: check xml
+        description: checks xml files for parseable syntax.
+        entry: check-xml
+        language: python
+        types: [xml]
+      - id: check-yaml
+        name: check yaml
+        description: checks yaml files for parseable syntax.
+        entry: check-yaml
+        language: python
+        types: [yaml]
+      - id: debug-statements
+        name: debug statements (python)
+        description: checks for debugger imports and py37+ `breakpoint()` calls in python source.
+        entry: debug-statement-hook
+        language: python
+        types: [python]
+      - id: destroyed-symlinks
+        name: detect destroyed symlinks
+        description: detects symlinks which are changed to regular files with a content of a path which that symlink was pointing to.
+        entry: destroyed-symlinks
+        language: python
+        types: [file]
+      - id: detect-private-key
+        name: detect private key
+        description: detects the presence of private keys.
+        entry: detect-private-key
+        language: python
+        types: [text]
+      - id: end-of-file-fixer
+        name: fix end of files
+        description: ensures that a file is either empty, or ends with one newline.
+        entry: end-of-file-fixer
+        language: python
+        types: [text]
+        stages: [commit, push, manual]
+      - id: file-contents-sorter
+        name: file contents sorter
+        description: sorts the lines in specified files (defaults to alphabetical). you must provide list of target files as input in your .pre-commit-config.yaml file.
+        entry: file-contents-sorter
+        language: python
+        files: "^$"
+      - id: fix-byte-order-marker
+        name: fix utf-8 byte order marker
+        description: removes utf-8 byte order marker.
+        entry: fix-byte-order-marker
+        language: python
+        types: [text]
+      - id: mixed-line-ending
+        name: mixed line ending
+        description: replaces or checks mixed line ending.
+        entry: mixed-line-ending
+        language: python
+        types: [text]
+      - id: no-commit-to-branch
+        name: "don't commit to branch"
+        entry: no-commit-to-branch
+        language: python
         pass_filenames: false
         always_run: true
+      - id: requirements-txt-fixer
+        name: fix requirements.txt
+        description: sorts entries in requirements.txt.
+        entry: requirements-txt-fixer
+        language: python
+        files: requirements.*\.txt$
+      - id: sort-simple-yaml
+        name: sort simple yaml files
+        description: sorts simple yaml files which consist only of top-level keys, preserving comments and blocks.
+        language: python
+        entry: sort-simple-yaml
+        files: "^$"
+      - id: trailing-whitespace
+        name: trim trailing whitespace
+        description: trims trailing whitespace.
+        entry: trailing-whitespace-fixer
+        language: python
+        types: [text]
+        stages: [commit, push, manual]
+
+  #  - repo: local
+  #    hooks:
+  #      - id: sphinx-check
+  #        name: sphinx-check
+  #        entry: docs/make.sh
+  #        language: script
+  #        types: [ python ]
+  #        pass_filenames: false
+
+  #  - repo: local
+  #    hooks:
+  #      - id: pytest-check
+  #        name: pytest-check
+  #        entry: pytest migration --ignore-glob=*exclude*
+  #        language: system
+  #        pass_filenames: false
+  #        always_run: true
+
+  #  - repo: https://github.com/jshwi/docsig # BUGGY!
+  #    rev: v0.30.0
+  #    hooks:
+  #      - id: docsig
+  #        args:
+  #          - "--check-class"
+  #          - "--check-dunders"
+  #          - "--check-overridden"
+  #          - "--check-protected"
+  #          - "--summary"
+
+  #- repo: https://github.com/pycqa/pydocstyle # SLOW!
+  #  rev: 6.3.0  # pick a git hash / tag to point to
+  #  hooks:
+  #    - id: pydocstyle
+
+  #  - repo: https://github.com/jsh9/pydoclint
+  #    rev: 0.3.8
+  #    hooks:
+  #      - id: pydoclint
+  #        args:
+  #          [
+  #            --style=sphinx,
+  #            --check-return-types=False,
+  #            --arg-type-hints-in-docstring=False,
+  #          ]

.pyup.yml

@@ -59,4 +59,4 @@ branch_prefix: pyup/
 
 # allow to close stale PRs
 # default: True
-close_prs: True
+close_prs: True

.readthedocs.yaml

@@ -29,4 +29,4 @@ conda:
 # Optionally declare the Python requirements required to build your docs
 python:
   install:
-    - requirements: requirements/requirements_dev.txt
+    - requirements: requirements/requirements_dev.txt

.travis.yml

@@ -1,8 +1,8 @@
 dist: xenial
 language: python
 python:
-  - '3.7'
-  - '3.8'
+  - "3.7"
+  - "3.8"
 install:
   - pip install -r requirements.txt
   - pip install -r requirements/requirements_dev.txt
@@ -11,4 +11,3 @@ script:
   - pytest --cov=yeet
   - coveralls
   - black --check yeet
-