Skip to content

Commit

Permalink
Updated files with 'repo_helper'. (#80)
Browse files Browse the repository at this point in the history
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
  • Loading branch information
repo-helper[bot] committed Jul 19, 2021
1 parent a4f38bd commit ced4604
Show file tree
Hide file tree
Showing 15 changed files with 79 additions and 27 deletions.
2 changes: 0 additions & 2 deletions .bumpversion.cfg
Expand Up @@ -5,8 +5,6 @@ tag = True

[bumpversion:file:repo_helper.yml]

[bumpversion:file:__pkginfo__.py]

[bumpversion:file:README.rst]

[bumpversion:file:repo_helper/__init__.py]
Expand Down
5 changes: 2 additions & 3 deletions .github/actions_build_conda.sh
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
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/repo_helper-*.tar.bz2; do
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/conda_ci.yml
Expand Up @@ -12,7 +12,7 @@ permissions:
jobs:
tests:
name: "Conda"
runs-on: ubuntu-latest
runs-on: ubuntu-18.04

steps:
- name: Checkout 🛎️
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/docs_test_action.yml
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
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
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
9 changes: 7 additions & 2 deletions .github/workflows/python_ci.yml
Expand Up @@ -4,6 +4,11 @@ name: Windows

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

pull_request:

permissions:
actions: write
Expand All @@ -15,7 +20,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 +30,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
12 changes: 9 additions & 3 deletions .github/workflows/python_ci_linux.yml
Expand Up @@ -4,6 +4,12 @@ name: Linux

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

permissions:
actions: write
Expand All @@ -15,7 +21,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 +31,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 +158,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
9 changes: 7 additions & 2 deletions .github/workflows/python_ci_macos.yml
Expand Up @@ -4,6 +4,11 @@ name: macOS

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

pull_request:

permissions:
actions: write
Expand All @@ -15,7 +20,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 +30,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
6 changes: 1 addition & 5 deletions __pkginfo__.py
Expand Up @@ -11,12 +11,8 @@
# This script based on https://github.com/rocky/python-uncompyle6/blob/master/__pkginfo__.py
#

__all__ = [
"__version__",
"extras_require",
]
__all__ = ["extras_require"]

__version__ = "2021.6.13"
extras_require = {
"testing": [
"check-wheel-contents>=0.2.0",
Expand Down
7 changes: 3 additions & 4 deletions doc-source/requirements.txt
@@ -1,6 +1,5 @@
git+https://github.com/domdfcoding/sphinx-click.git
autodocsumm>=0.2.0
default-values>=0.4.2
default-values>=0.5.0
domdf-sphinx-theme>=0.3.0
extras-require>=0.2.0
seed-intersphinx-mapping>=0.3.1
Expand All @@ -12,8 +11,8 @@ sphinx-notfound-page>=0.5
sphinx-prompt>=1.1.0
sphinx-pyproject>=0.1.0
sphinx-tabs>=1.1.13
sphinx-toolbox>=2.10.0
sphinx-toolbox>=2.13.0
sphinxcontrib-autoprogram>=0.1.5
sphinxcontrib-httpdomain>=1.7.0
sphinxemoji>=0.1.6
toctree-plus>=0.1.0
toctree-plus>=0.5.0
33 changes: 33 additions & 0 deletions pyproject.toml
Expand Up @@ -132,6 +132,39 @@ autodoc_exclude_members = [
"__hash__",
]

[tool.whey]
base-classifiers = [
"Development Status :: 4 - Beta",
"Environment :: Console",
"Intended Audience :: Developers",
"Topic :: Software Development :: Build Tools",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: Software Development :: Version Control :: Git",
"Topic :: System :: Archiving :: Packaging",
"Topic :: System :: Software Distribution",
"Topic :: Utilities",
"Typing :: Typed",
]
python-versions = [ "3.6", "3.7", "3.8", "3.9",]
python-implementations = [ "CPython", "PyPy",]
platforms = [ "Windows", "macOS", "Linux",]
license-key = "LGPL-3.0-or-later"
additional-files = [
"include repo_helper/testing/repo_helper_example.yml",
"recursive-include repo_helper/templates *",
"recursive-include repo_helper/blocks *.rst",
"recursive-include repo_helper/init_repo_files *",
"include repo_helper/files/isort.cfg",
"include repo_helper/repo_helper_schema.json",
]

[tool.mypy]
python_version = "3.6"
namespace_packages = true
check_untyped_defs = true
warn_unused_ignores = true
no_implicit_optional = true

[tool.dep_checker.name_mapping]
attrs = "attr"
ruamel-yaml = "ruamel.yaml"
1 change: 1 addition & 0 deletions setup.cfg
Expand Up @@ -60,6 +60,7 @@ python_version = 3.6
namespace_packages = True
check_untyped_defs = True
warn_unused_ignores = True
no_implicit_optional = True
incremental = False

[options.entry_points]
Expand Down
3 changes: 1 addition & 2 deletions setup.py
Expand Up @@ -21,9 +21,8 @@
description="A tool to manage configuration files, build scripts etc. across multiple projects.",
extras_require=extras_require,
install_requires=install_requires,
name="repo_helper",
name="repo-helper",
py_modules=[],
version=__version__,
)

shutil.rmtree("repo_helper.egg-info", ignore_errors=True)

0 comments on commit ced4604

Please sign in to comment.