diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 3dbf015..6d0b6bd 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -10,8 +10,6 @@ replace = version = "{new_version}" [bumpversion:file:repo_helper.yml] -[bumpversion:file:__pkginfo__.py] - [bumpversion:file:README.rst] [bumpversion:file:doc-source/index.rst] diff --git a/.github/actions_build_conda.sh b/.github/actions_build_conda.sh index 01676e9..1c8409e 100755 --- a/.github/actions_build_conda.sh +++ b/.github/actions_build_conda.sh @@ -10,13 +10,12 @@ source "/home/runner/miniconda/etc/profile.d/conda.sh" hash -r conda activate base conda config --set always_yes yes --set changeps1 no -conda update -q conda -conda install conda-build -conda install anaconda-client +conda install conda=4.8.5 conda-build=3.18.11 conda info -a conda config --add channels conda-forge || exit 1 conda config --add channels domdfcoding || exit 1 +conda config --remove channels defaults conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing diff --git a/.github/actions_deploy_conda.sh b/.github/actions_deploy_conda.sh index 0603f84..fc91e64 100755 --- a/.github/actions_deploy_conda.sh +++ b/.github/actions_deploy_conda.sh @@ -8,8 +8,7 @@ source "/home/runner/miniconda/etc/profile.d/conda.sh" hash -r conda activate base conda config --set always_yes yes --set changeps1 no -conda update -q conda -conda install anaconda-client +conda install conda=4.8.5 anaconda-client conda info -a for f in conda/dist/noarch/sphinx-pyproject-*.tar.bz2; do diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 3a7f627..6cb7666 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -12,7 +12,7 @@ permissions: jobs: tests: name: "Conda" - runs-on: ubuntu-latest + runs-on: ubuntu-18.04 steps: - name: Checkout 🛎️ @@ -28,7 +28,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade repo_helper + python -m pip install --upgrade whey-conda # $CONDA is an environment variable pointing to the root of the miniconda directory $CONDA/bin/conda update -q conda $CONDA/bin/conda install conda-build=3.21.0 @@ -38,7 +38,7 @@ jobs: - name: "Build and index channel" run: | - python -m repo_helper build --conda --out-dir conda-bld/noarch + python -m whey --builder whey_conda --out-dir conda-bld/noarch $CONDA/bin/conda index ./conda-bld || exit 1 - name: "Search for package" diff --git a/.github/workflows/docs_test_action.yml b/.github/workflows/docs_test_action.yml index 720ef13..8efbe64 100644 --- a/.github/workflows/docs_test_action.yml +++ b/.github/workflows/docs_test_action.yml @@ -2,7 +2,11 @@ --- name: "Docs Check" on: - - push + push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: contents: read diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml index 116e13f..f46a179 100644 --- a/.github/workflows/flake8.yml +++ b/.github/workflows/flake8.yml @@ -4,6 +4,10 @@ name: Flake8 on: push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: contents: read diff --git a/.github/workflows/mypy.yml b/.github/workflows/mypy.yml index 5fb5285..d6d4200 100644 --- a/.github/workflows/mypy.yml +++ b/.github/workflows/mypy.yml @@ -4,6 +4,10 @@ name: mypy on: push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: contents: read diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index 1573c49..b1d61be 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -4,6 +4,10 @@ name: Windows on: push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: actions: write @@ -15,7 +19,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7' strategy: fail-fast: False @@ -25,7 +29,7 @@ jobs: - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - - {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 26f41c1..08b0d1f 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -4,6 +4,10 @@ name: Linux on: push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: actions: write @@ -15,7 +19,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7' strategy: fail-fast: False @@ -25,7 +29,7 @@ jobs: - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - - {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} @@ -152,7 +156,7 @@ jobs: Conda: needs: deploy - runs-on: "ubuntu-20.04" + runs-on: "ubuntu-18.04" if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true) steps: - name: Checkout 🛎️ diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index 13f04ad..1063885 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -4,6 +4,10 @@ name: macOS on: push: + branches-ignore: + - 'repo-helper-update' + - 'pre-commit-ci-update-config' + pull_request: permissions: actions: write @@ -15,7 +19,7 @@ jobs: runs-on: "macos-latest" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.3,pypy-3.6,pypy-3.7' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-beta.4,pypy-3.6,pypy-3.7' strategy: fail-fast: False @@ -25,7 +29,7 @@ jobs: - {python-version: "3.7", testenvs: "py37,build", experimental: False} - {python-version: "3.8", testenvs: "py38,build", experimental: False} - {python-version: "3.9", testenvs: "py39,build", experimental: False} - - {python-version: "3.10.0-beta.3", testenvs: "py310-dev,build", experimental: True} + - {python-version: "3.10.0-beta.4", testenvs: "py310-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 39fd478..c041ec7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,7 +46,7 @@ repos: files: ^sphinx_pyproject/.*\.py$ - repo: https://github.com/domdfcoding/flake2lint - rev: v0.4.0 + rev: v0.4.1 hooks: - id: flake2lint @@ -73,7 +73,7 @@ repos: - id: forbid-crlf - repo: https://github.com/repo-helper/formate - rev: v0.4.7 + rev: v0.4.9 hooks: - id: formate exclude: ^(doc-source/conf|__pkginfo__|setup)\.(_)?py$ diff --git a/__pkginfo__.py b/__pkginfo__.py index a619f75..ea4ef04 100644 --- a/__pkginfo__.py +++ b/__pkginfo__.py @@ -11,10 +11,6 @@ # This script based on https://github.com/rocky/python-uncompyle6/blob/master/__pkginfo__.py # -__all__ = [ - "__version__", - "extras_require", - ] +__all__ = ["extras_require"] -__version__ = "0.1.0" extras_require = {} diff --git a/setup.cfg b/setup.cfg index cd5c33a..36bee7a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,3 +11,4 @@ python_version = 3.6 namespace_packages = True check_untyped_defs = True warn_unused_ignores = True +no_implicit_optional = True