Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
5 changes: 2 additions & 3 deletions .github/actions_build_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions .github/actions_deploy_conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
tests:
name: "Conda"
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

steps:
- name: Checkout 🛎️
Expand All @@ -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
Expand All @@ -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"
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: Flake8

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
contents: read
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: mypy

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
contents: read
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/python_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: Windows

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
actions: write
Expand All @@ -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
Expand All @@ -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}

Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/python_ci_linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: Linux

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
actions: write
Expand All @@ -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
Expand All @@ -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}

Expand Down Expand Up @@ -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 🛎️
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/python_ci_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ name: macOS

on:
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
pull_request:

permissions:
actions: write
Expand All @@ -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
Expand All @@ -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}

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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$
Expand Down
6 changes: 1 addition & 5 deletions __pkginfo__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {}
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ python_version = 3.6
namespace_packages = True
check_untyped_defs = True
warn_unused_ignores = True
no_implicit_optional = True