Skip to content

Commit e8fa6c3

Browse files
repo-helper[bot]repo-helper[bot]
authored
Updated files with 'repo_helper'. (#6)
Co-authored-by: repo-helper[bot] <74742576+repo-helper[bot]@users.noreply.github.com>
1 parent 3919227 commit e8fa6c3

18 files changed

+228
-99
lines changed

‎.github/actions_build_conda.sh‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ conda install conda-build
1515
conda install anaconda-client
1616
conda info -a
1717

18-
conda config --add channels domdfcoding || exit 1
19-
2018
conda config --add channels conda-forge || exit 1
19+
conda config --add channels domdfcoding || exit 1
2120

22-
conda build conda -c domdfcoding -c conda-forge --output-folder conda/dist --skip-existing
21+
conda build conda -c conda-forge -c domdfcoding --output-folder conda/dist --skip-existing
2322

2423
exit 0

‎.github/dependabot.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# This file is managed by 'repo_helper'. Don't edit it directly.
2+
---
3+
version: 2
4+
updates:
5+
- package-ecosystem: pip
6+
directory: /
7+
schedule:
8+
interval: weekly
9+
reviewers:
10+
- domdfcoding

‎.github/workflows/conda_ci.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ jobs:
1212
name: "Conda"
1313
runs-on: ubuntu-latest
1414

15-
strategy:
16-
1715
steps:
1816
- name: Checkout 🛎️
1917
uses: "actions/checkout@v2"
@@ -31,15 +29,16 @@ jobs:
3129
python -m pip install --upgrade repo_helper
3230
# $CONDA is an environment variable pointing to the root of the miniconda directory
3331
$CONDA/bin/conda update -q conda
34-
35-
$CONDA/bin/conda config --add channels domdfcoding
32+
$CONDA/bin/conda install conda-build
3633
3734
$CONDA/bin/conda config --add channels conda-forge
38-
35+
$CONDA/bin/conda config --add channels domdfcoding
3936
4037
- name: "Build and install package"
4138
run: |
4239
# This mess is only necessary because conda won't fix it themselves
4340
# https://github.com/conda/conda/issues/1884
41+
4442
python -m repo_helper build --conda --out-dir conda-bld/noarch
45-
$CONDA/bin/conda install flake8_strftime -c local -y || exit 1
43+
$CONDA/bin/conda index ./conda-bld || exit 1
44+
$CONDA/bin/conda install -c file://$(pwd)/conda-bld flake8_strftime -y || exit 1

‎.github/workflows/flake8.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# This file is managed by 'repo_helper'. Don't edit it directly.
2+
---
3+
name: Flake8
4+
5+
on:
6+
push:
7+
pull_request:
8+
branches: ["master"]
9+
10+
jobs:
11+
Run:
12+
name: "Flake8"
13+
runs-on: "ubuntu-18.04"
14+
15+
steps:
16+
- name: Checkout 🛎️
17+
uses: "actions/checkout@v2"
18+
19+
- name: Setup Python 🐍
20+
uses: "actions/setup-python@v2"
21+
with:
22+
python-version: "3.8"
23+
24+
- name: Install dependencies 🔧
25+
run: |
26+
python -VV
27+
python -m site
28+
python -m pip install --upgrade pip setuptools wheel
29+
python -m pip install tox
30+
31+
- name: "Run Flake8"
32+
run: "python -m tox -e lint -- --format github"

‎.github/workflows/mypy.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This file is managed by 'repo_helper'. Don't edit it directly.
2+
---
3+
name: mypy
4+
5+
on:
6+
push:
7+
pull_request:
8+
branches: ["master"]
9+
10+
jobs:
11+
Run:
12+
name: "mypy / ${{ matrix.os }}"
13+
runs-on: ${{ matrix.os }}
14+
15+
strategy:
16+
matrix:
17+
os: [ubuntu-latest, windows-latest, macos-latest]
18+
fail-fast: false
19+
20+
steps:
21+
- name: Checkout 🛎️
22+
uses: "actions/checkout@v2"
23+
24+
- name: Setup Python 🐍
25+
uses: "actions/setup-python@v2"
26+
with:
27+
python-version: "3.6"
28+
29+
- name: Install dependencies 🔧
30+
run: |
31+
python -VV
32+
python -m site
33+
python -m pip install --upgrade pip setuptools wheel
34+
python -m pip install tox
35+
36+
- name: "Run mypy"
37+
run: "python -m tox -e mypy"

‎.github/workflows/octocheese.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
name: "GitHub Releases"
55
on:
66
push:
7+
branches: ["master"]
78
schedule:
89
- cron: 0 12 * * 2,4,6
910

@@ -16,3 +17,4 @@ jobs:
1617
pypi_name: "flake8_strftime"
1718
env:
1819
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
20+
if: startsWith(github.ref, 'refs/tags/') != true

‎.github/workflows/python_ci.yml‎

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: Windows Tests
3+
name: Windows
44

55
on:
66
push:
@@ -9,30 +9,37 @@ on:
99

1010
jobs:
1111
tests:
12-
name: "Python ${{ matrix.python-version }}"
12+
name: "windows-2019 / Python ${{ matrix.config.python-version }}"
1313
runs-on: "windows-2019"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,3.9'
16+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
20-
python-version: ["3.6","3.7","3.8","3.9"]
21+
config:
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
26+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
2127

2228
steps:
2329
- name: Checkout 🛎️
2430
uses: "actions/checkout@v2"
31+
2532
- name: Setup Python 🐍
2633
uses: "actions/setup-python@v2"
2734
with:
28-
python-version: "${{ matrix.python-version }}"
35+
python-version: "${{ matrix.config.python-version }}"
36+
2937
- name: Install dependencies 🔧
3038
run: |
3139
python -VV
3240
python -m site
3341
python -m pip install --upgrade pip setuptools wheel
34-
python -m pip install --upgrade tox tox-gh-actions virtualenv
35-
42+
python -m pip install --upgrade tox virtualenv
3643
37-
- name: "Run Tests for Python ${{ matrix.python-version }}"
38-
run: "python -m tox"
44+
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
45+
run: python -m tox -e "${{ matrix.config.testenvs }}"

‎.github/workflows/python_ci_linux.yml‎

Lines changed: 32 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: Linux Tests
3+
name: Linux
44

55
on:
66
push:
@@ -9,45 +9,54 @@ on:
99

1010
jobs:
1111
tests:
12-
name: "Python ${{ matrix.python-version }}"
13-
runs-on: "ubuntu-18.04"
12+
name: "ubuntu-20.04 / Python ${{ matrix.config.python-version }}"
13+
runs-on: "ubuntu-20.04"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy3'
16+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
20-
python-version: ["3.6","3.7","3.8","3.9","pypy3"]
21+
config:
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
26+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
27+
- {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
2128

2229
steps:
2330
- name: Checkout 🛎️
2431
uses: "actions/checkout@v2"
32+
2533
- name: Setup Python 🐍
2634
uses: "actions/setup-python@v2"
2735
with:
28-
python-version: "${{ matrix.python-version }}"
36+
python-version: "${{ matrix.config.python-version }}"
37+
2938
- name: Install dependencies 🔧
3039
run: |
3140
python -VV
3241
python -m site
3342
python -m pip install --upgrade pip setuptools wheel
34-
python -m pip install --upgrade tox tox-gh-actions virtualenv
43+
python -m pip install --upgrade tox virtualenv
3544
python -m pip install --upgrade coverage_pyver_pragma
3645
37-
- name: "Run Tests for Python ${{ matrix.python-version }}"
38-
run: "python -m tox"
46+
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
47+
run: python -m tox -e "${{ matrix.config.testenvs }}"
3948

4049

41-
- name: "Upload Coverage"
50+
- name: "Upload Coverage 🚀"
4251
uses: actions/upload-artifact@v2
4352
with:
44-
name: "coverage-${{ matrix.python-version }}"
53+
name: "coverage-${{ matrix.config.python-version }}"
4554
path: .coverage
4655

4756

4857
Coverage:
4958
needs: tests
50-
runs-on: "ubuntu-18.04"
59+
runs-on: "ubuntu-20.04"
5160
steps:
5261
- name: Checkout 🛎️
5362
uses: "actions/checkout@v2"
@@ -62,7 +71,7 @@ jobs:
6271
python -m pip install --upgrade pip setuptools wheel
6372
python -m pip install --upgrade coveralls coverage_pyver_pragma
6473
65-
- name: "Download Coverage"
74+
- name: "Download Coverage 🪂"
6675
uses: actions/download-artifact@v2
6776
with:
6877
path: coverage
@@ -71,12 +80,12 @@ jobs:
7180
run: ls -R
7281
working-directory: coverage
7382

74-
- name: Combine Coverage
83+
- name: Combine Coverage 👷
7584
run: |
7685
shopt -s globstar
7786
python -m coverage combine coverage/**/.coverage
7887
79-
- name: "Upload Combined Coverage Artefact"
88+
- name: "Upload Combined Coverage Artefact 🚀"
8089
uses: actions/upload-artifact@v2
8190
with:
8291
name: "combined-coverage"
@@ -91,27 +100,31 @@ jobs:
91100
Deploy:
92101
needs: tests
93102

94-
runs-on: "ubuntu-18.04"
103+
runs-on: "ubuntu-20.04"
95104
steps:
96105
- name: Checkout 🛎️
97106
uses: "actions/checkout@v2"
107+
if: startsWith(github.ref, 'refs/tags/')
98108

99109
- name: Setup Python 🐍
100110
uses: "actions/setup-python@v2"
101111
with:
102112
python-version: 3.8
113+
if: startsWith(github.ref, 'refs/tags/')
103114

104115
- name: Install dependencies 🔧
105116
run: |
106117
python -m pip install --upgrade pip setuptools wheel
107118
python -m pip install --upgrade tox
119+
if: startsWith(github.ref, 'refs/tags/')
108120

109121
- name: Build distributions 📦
110122
run: |
111123
tox -e build
112124
125+
if: startsWith(github.ref, 'refs/tags/')
113126

114-
- name: Upload distribution 📦 to PyPI
127+
- name: Upload distribution to PyPI 🚀
115128
if: startsWith(github.ref, 'refs/tags/')
116129
uses: pypa/gh-action-pypi-publish@master
117130
with:
@@ -123,7 +136,8 @@ jobs:
123136

124137
Conda:
125138
needs: deploy
126-
runs-on: "ubuntu-18.04"
139+
runs-on: "ubuntu-20.04"
140+
if: startsWith(github.ref, 'refs/tags/') || (startsWith(github.event.head_commit.message, 'Bump version') != true)
127141
steps:
128142
- name: Checkout 🛎️
129143
uses: "actions/checkout@v2"
@@ -147,7 +161,6 @@ jobs:
147161
bash .github/actions_build_conda.sh
148162
149163
- name: Deploy Conda 🚀
150-
if: startsWith(github.ref, 'refs/tags/')
151164
run: |
152165
chmod +x .github/actions_deploy_conda.sh
153166
bash .github/actions_deploy_conda.sh

‎.github/workflows/python_ci_macos.yml‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is managed by 'repo_helper'. Don't edit it directly.
22
---
3-
name: macOS Tests
3+
name: macOS
44

55
on:
66
push:
@@ -9,30 +9,38 @@ on:
99

1010
jobs:
1111
tests:
12-
name: "Python ${{ matrix.python-version }}"
12+
name: "macos-latest / Python ${{ matrix.config.python-version }}"
1313
runs-on: "macos-latest"
14+
continue-on-error: ${{ matrix.config.experimental }}
1415
env:
15-
USING_COVERAGE: '3.6,3.7,3.8,3.9,pypy3'
16+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10.0-alpha.3,pypy-3.6'
1617

1718
strategy:
1819
fail-fast: False
1920
matrix:
20-
python-version: ["3.6","3.7","3.8","3.9","pypy3"]
21+
config:
22+
- {python-version: "3.6", testenvs: "py36,build", experimental: False}
23+
- {python-version: "3.7", testenvs: "py37,build", experimental: False}
24+
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
25+
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
26+
- {python-version: "3.10.0-alpha.3", testenvs: "py310-dev,build", experimental: True}
27+
- {python-version: "pypy-3.6", testenvs: "pypy3,build", experimental: False}
2128

2229
steps:
2330
- name: Checkout 🛎️
2431
uses: "actions/checkout@v2"
32+
2533
- name: Setup Python 🐍
2634
uses: "actions/setup-python@v2"
2735
with:
28-
python-version: "${{ matrix.python-version }}"
36+
python-version: "${{ matrix.config.python-version }}"
37+
2938
- name: Install dependencies 🔧
3039
run: |
3140
python -VV
3241
python -m site
3342
python -m pip install --upgrade pip setuptools wheel
34-
python -m pip install --upgrade tox tox-gh-actions virtualenv
35-
43+
python -m pip install --upgrade tox virtualenv
3644
37-
- name: "Run Tests for Python ${{ matrix.python-version }}"
38-
run: "python -m tox"
45+
- name: "Run Tests for Python ${{ matrix.config.python-version }}"
46+
run: python -m tox -e "${{ matrix.config.testenvs }}"

0 commit comments

Comments
 (0)