Updated config files.

Author: domdfcoding

.ci/travis_deploy_conda.sh

@@ -8,7 +8,8 @@ if [ "$TRAVIS_PYTHON_VERSION" == 3.6 ]; then
     echo "Deferring building conda package because this is release"
   else
 
-    python3 ./make_conda_recipe.py || exit 1
+    python3 -m pip install repo_helper || exit 1
+    python3 -m repo_helper make-recipe || exit 1
 
     # Switch to miniconda
     source "/home/travis/miniconda/etc/profile.d/conda.sh"

.github/workflows/conda_ci.yml

@@ -0,0 +1,46 @@
+# This file is managed by 'repo_helper'. Don't edit it directly.
+---
+name: Conda Tests
+
+on:
+  push:
+  pull_request:
+    branches: ["master"]
+
+jobs:
+  tests:
+    name: "Python ${{ matrix.python-version }}"
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: False
+      matrix:
+        python-version: ["3.6","3.7","3.8","3.9"]
+
+    steps:
+      - name: Checkout 🛎️
+        uses: "actions/checkout@v2"
+      - name: Setup Python 🐍
+        uses: "actions/setup-python@v2"
+        with:
+          python-version: "${{ matrix.python-version }}"
+      - name: Install dependencies 🔧
+        run: |
+          python -VV
+          python -m site
+          python -m pip install --upgrade pip setuptools wheel
+          python -m pip install --upgrade repo_helper
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          $CONDA/bin/conda update -q conda
+
+          $CONDA/bin/conda config --add channels domdfcoding
+
+          $CONDA/bin/conda config --add channels conda-forge
+
+
+      - name: "Build and install package"
+        run: |
+          # This mess is only necessary because conda won't fix it themselves
+          # https://github.com/conda/conda/issues/1884
+          python -m repo_helper build --conda --out-dir conda-bld/noarch
+           $CONDA/bin/conda install flake8-dunder-all -c local -y || exit 1

.isort.cfg

@@ -15,6 +15,8 @@ default_section = THIRDPARTY
 ;no_lines_before=LOCALFOLDER
 known_third_party =
     asttokens
+    click
+    consolekit
     coverage
     coverage-pyver-pragma
     domdf-python-tools

.pre-commit-config.yaml

@@ -24,7 +24,7 @@ repos:
     - id: mixed-line-ending
 
  - repo: https://github.com/domdfcoding/pre-commit-hooks
-   rev: v0.0.4
+   rev: v0.1.1
    hooks:
     - id: requirements-txt-sorter
       args:
@@ -62,3 +62,12 @@ repos:
    hooks:
     - id: yapf-isort
       exclude: ^(doc-source/conf|__pkginfo__|make_conda_recipe|setup)\.py$
+
+ - repo: https://github.com/domdfcoding/dep_checker
+   rev: v0.3.1
+   hooks:
+    - id: dep_checker
+      args:
+       - flake8_dunder_all
+
+# Custom hooks can be added below this comment

.travis.yml

@@ -35,6 +35,7 @@ stages:
 jobs:
   allow_failures:
     - arch: arm64
+    - python: ['3.10-dev']
 
   exclude:
     - python: '3.7'
@@ -72,7 +73,6 @@ jobs:
         apt:
           update: true
       install:
-        - pip install rst2txt yolk3k
         - wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh -O miniconda.sh
         - bash miniconda.sh -b -p $HOME/miniconda
         - chmod +x .ci/travis_deploy_conda.sh

CONTRIBUTING.rst

@@ -17,17 +17,16 @@ Install ``pre-commit`` with ``pip`` and install the git hook:
 Coding style
 --------------
 
-`Yapf <https://github.com/google/yapf>`_ is used for code formatting, and `isort <https://timothycrosley.github.io/isort/>`_ is used to sort imports.
+`yapf-isort <https://pypi.org/project/yapf-isort/>`_ is used for code formatting.
 
-``yapf`` and ``isort`` can be run manually via ``pre-commit``:
+It can be run manually via ``pre-commit``:
 
 .. code-block:: bash
 
-	$ pre-commit run yapf -a
-	$ pre-commit run isort -a
+	$ pre-commit run yapf-isort -a
 
 
-The complete autoformatting suite can be run with ``pre-commit``:
+Or, to run the complete autoformatting suite:
 
 .. code-block:: bash
 

doc-source/contributing.rst

@@ -16,17 +16,16 @@ Install ``pre-commit`` with ``pip`` and install the git hook:
 Coding style
 --------------
 
-`Yapf <https://github.com/google/yapf>`_ is used for code formatting, and `isort <https://timothycrosley.github.io/isort/>`_ is used to sort imports.
+`yapf-isort <https://pypi.org/project/yapf-isort/>`_ is used for code formatting.
 
-``yapf`` and ``isort`` can be run manually via ``pre-commit``:
+It can be run manually via ``pre-commit``:
 
 .. prompt:: bash
 
-	pre-commit run yapf -a
-	pre-commit run isort -a
+	pre-commit run yapf-isort -a
 
 
-The complete autoformatting suite can be run with ``pre-commit``:
+Or, to run the complete autoformatting suite:
 
 .. prompt:: bash
 

doc-source/requirements.txt

@@ -10,7 +10,7 @@ sphinx-copybutton>=0.2.12
 sphinx-notfound-page>=0.5
 sphinx-prompt>=1.1.0
 sphinx-tabs>=1.1.13
-sphinx-toolbox>=1.7.1
+sphinx-toolbox>=1.7.2
 sphinxcontrib-httpdomain>=1.7.0
 sphinxemoji>=0.1.6
 tabulate>=0.8.7

lint_roller.sh

@@ -4,6 +4,7 @@
 #     * options
 #     * options.packages.find
 #     * mypy
+#     * options.entry_points
 
 [metadata]
 name = flake8-dunder-all
@@ -56,8 +57,6 @@ check_untyped_defs = True
 warn_unused_ignores = True
 
 [options.entry_points]
-flake8.extension =
-    DUNDER_ALL=flake8_dunder_all:Plugin
 console_scripts =
     ensure_dunder_all=flake8_dunder_all.__main__:main
     ensure-dunder-all=flake8_dunder_all.__main__:main