Skip to content

Commit

Permalink
Merge afea0f1 into 154e93c
Browse files Browse the repository at this point in the history
  • Loading branch information
repo-helper[bot] committed May 10, 2022
2 parents 154e93c + afea0f1 commit 87671b9
Show file tree
Hide file tree
Showing 29 changed files with 517 additions and 257 deletions.
6 changes: 4 additions & 2 deletions .bumpversion.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ tag = True

[bumpversion:file:repo_helper.yml]

[bumpversion:file:__pkginfo__.py]

[bumpversion:file:README.rst]

[bumpversion:file:doc-source/index.rst]
Expand All @@ -16,3 +14,7 @@ search: __version__: str = "{current_version}"
replace: __version__: str = "{new_version}"

[bumpversion:file:pyproject.toml]
search = version = "{current_version}"
replace = version = "{new_version}"

[bumpversion:file:.github/workflows/conda_ci.yml]
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ If possible, please include a small, self-contained reproduction.
* Southwark:

## Installation source
<!-- e.g. Github repository, Github Releases, PyPI/pip, Anaconda/conda -->
<!-- e.g. GitHub repository, GitHub Releases, PyPI/pip, Anaconda/conda -->


## Other Additional Information:
Expand Down
23 changes: 0 additions & 23 deletions .github/actions_build_conda.sh

This file was deleted.

24 changes: 0 additions & 24 deletions .github/actions_deploy_conda.sh

This file was deleted.

28 changes: 28 additions & 0 deletions .github/milestones.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env python

# stdlib
import os
import sys

# 3rd party
from github3 import GitHub
from github3.repos import Repository
from packaging.version import InvalidVersion, Version

latest_tag = os.environ["GITHUB_REF_NAME"]

try:
current_version = Version(latest_tag)
except InvalidVersion:
sys.exit()

gh: GitHub = GitHub(token=os.environ["GITHUB_TOKEN"])
repo: Repository = gh.repository(*os.environ["GITHUB_REPOSITORY"].split('/', 1))

for milestone in repo.milestones(state="open"):
try:
milestone_version = Version(milestone.title)
except InvalidVersion:
continue
if milestone_version == current_version:
sys.exit(not milestone.update(state="closed"))
12 changes: 6 additions & 6 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ daysUntilStale: 180

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 180
daysUntilClose: false

# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
onlyLabels: []
Expand All @@ -28,13 +28,13 @@ exemptMilestones: false
exemptAssignees: false

# Label to use when marking as stale
staleLabel: wontfix
staleLabel: stale

# Comment to post when marking as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
markComment: false
# This issue has been automatically marked as stale because it has not had
# recent activity. It will be closed if no further activity occurs. Thank you
# for your contributions.

# Comment to post when removing the stale label.
# unmarkComment: >
Expand Down
14 changes: 0 additions & 14 deletions .github/workflows/cleanup.yml

This file was deleted.

44 changes: 33 additions & 11 deletions .github/workflows/conda_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@ on:
push:
branches: ["master"]

permissions:
contents: read

jobs:
tests:
name: "Conda"
runs-on: ubuntu-latest
runs-on: ubuntu-18.04
defaults:
run:
shell: bash -l {0}

steps:
- name: Checkout 🛎️
Expand All @@ -20,24 +26,40 @@ jobs:
with:
python-version: "3.8"

- name: Setup Conda
uses: conda-incubator/setup-miniconda@v2
with:
activate-environment: env
conda-build-version: 3.21.0

- name: Install dependencies 🔧
run: |
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" "whey"
# $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
$CONDA/bin/conda update -n base conda
$CONDA/bin/conda config --add channels conda-forge
$CONDA/bin/conda config --add channels domdfcoding
- name: "Build and install package"
- name: "Build and index channel"
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
python -m whey --builder whey_conda --out-dir conda-bld/noarch
$CONDA/bin/conda index ./conda-bld || exit 1
$CONDA/bin/conda install -c file://$(pwd)/conda-bld southwark -y || exit 1
- name: "Search for package"
run: |
$CONDA/bin/conda search -c file://$(pwd)/conda-bld southwark
$CONDA/bin/conda search -c file://$(pwd)/conda-bld --override-channels southwark
- name: "Install package"
run: |
$CONDA/bin/conda install -c file://$(pwd)/conda-bld southwark=0.8.1=py_1 -y || exit 1
- name: "Run Tests"
run: |
rm -rf southwark
$CONDA/bin/conda install pytest coincidence || exit 1
pip install -r tests/requirements.txt
pytest tests/
27 changes: 23 additions & 4 deletions .github/workflows/docs_test_action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,36 @@
---
name: "Docs Check"
on:
- push
push:
branches-ignore:
- 'repo-helper-update'
- 'pre-commit-ci-update-config'
- 'imgbot'
pull_request:

permissions:
contents: read

jobs:
docs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: "actions/checkout@v1"
uses: "actions/checkout@v2"

- name: Check for changed files
uses: dorny/paths-filter@v2
id: changes
with:
list-files: "json"
filters: |
code:
- '!tests/**'
- name: Install and Build 🔧
uses: ammaraskar/sphinx-action@master
uses: sphinx-toolbox/sphinx-action@sphinx-3.3.1
if: steps.changes.outputs.code == 'true'
with:
pre-build-command: apt-get update && apt-get install gcc python3-dev git pandoc -y && python -m pip install tox
pre-build-command: python -m pip install tox
docs-folder: "doc-source/"
build-command: "tox -e docs -- "
24 changes: 22 additions & 2 deletions .github/workflows/flake8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ name: Flake8

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

permissions:
contents: read

jobs:
Run:
Expand All @@ -14,17 +22,29 @@ jobs:
- name: Checkout 🛎️
uses: "actions/checkout@v2"

- name: Check for changed files
uses: dorny/paths-filter@v2
id: changes
with:
list-files: "json"
filters: |
code:
- '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
with:
python-version: "3.8"
python-version: "3.6"

- name: Install dependencies 🔧
if: steps.changes.outputs.code == 'true'
run: |
python -VV
python -m site
python -m pip install --upgrade pip setuptools wheel
python -m pip install tox
- name: "Run Flake8"
run: "python -m tox -e lint -- --format github"
if: steps.changes.outputs.code == 'true'
run: "python -m tox -e lint -s false -- --format github"
21 changes: 20 additions & 1 deletion .github/workflows/mypy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ name: mypy

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

permissions:
contents: read

jobs:
Run:
Expand All @@ -19,7 +27,17 @@ jobs:
- name: Checkout 🛎️
uses: "actions/checkout@v2"

- name: Check for changed files
uses: dorny/paths-filter@v2
id: changes
with:
list-files: "json"
filters: |
code:
- '!(doc-source/**|CONTRIBUTING.rst|.imgbotconfig|.pre-commit-config.yaml|.pylintrc|.readthedocs.yml)'
- name: Setup Python 🐍
if: steps.changes.outputs.code == 'true'
uses: "actions/setup-python@v2"
with:
python-version: "3.6"
Expand All @@ -32,4 +50,5 @@ jobs:
python -m pip install --upgrade tox virtualenv
- name: "Run mypy"
run: "python -m tox -e mypy"
if: steps.changes.outputs.code == 'true'
run: "python -m tox -e mypy -s false"
4 changes: 1 addition & 3 deletions .github/workflows/octocheese.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@

name: "GitHub Releases"
on:
push:
branches: ["master"]
schedule:
- cron: 0 12 * * 2,4,6
- cron: 0 12 * * *

jobs:
Run:
Expand Down
Loading

0 comments on commit 87671b9

Please sign in to comment.