Skip to content

Commit 998bea8

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

5 files changed

Lines changed: 21 additions & 16 deletions

File tree

.github/workflows/conda_ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ jobs:
1313
tests:
1414
name: "Conda"
1515
runs-on: ubuntu-18.04
16+
defaults:
17+
run:
18+
shell: bash -l {0}
1619

1720
steps:
1821
- name: Checkout 🛎️
@@ -23,16 +26,19 @@ jobs:
2326
with:
2427
python-version: "3.8"
2528

29+
- name: Setup Conda
30+
uses: conda-incubator/setup-miniconda@v2
31+
with:
32+
activate-environment: env
33+
conda-build-version: 3.21.0
34+
2635
- name: Install dependencies 🔧
2736
run: |
2837
python -VV
2938
python -m site
3039
python -m pip install --upgrade pip setuptools wheel
31-
python -m pip install --upgrade whey-conda whey whey-pth
40+
python -m pip install --upgrade "whey-conda" "whey" "whey-pth"
3241
# $CONDA is an environment variable pointing to the root of the miniconda directory
33-
$CONDA/bin/conda update -q conda
34-
$CONDA/bin/conda install conda-build=3.21.0
35-
3642
$CONDA/bin/conda config --add channels conda-forge
3743
$CONDA/bin/conda config --add channels domdfcoding
3844
@@ -53,5 +59,6 @@ jobs:
5359
- name: "Run Tests"
5460
run: |
5561
rm -rf flake8_helper
56-
$CONDA/bin/pip install -r tests/requirements.txt
57-
$CONDA/bin/pytest tests/
62+
$CONDA/bin/conda install pytest coincidence || exit 1
63+
pip install -r tests/requirements.txt
64+
pytest tests/

.github/workflows/python_ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "windows-2019"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8'
24+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8'
2525

2626
strategy:
2727
fail-fast: False
@@ -32,7 +32,7 @@ jobs:
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
3434
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35-
- {python-version: "3.11.0-alpha.3", testenvs: "py311-dev,build", experimental: True}
35+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3636
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3737
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3838
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}

.github/workflows/python_ci_linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: "ubuntu-20.04"
2323
continue-on-error: ${{ matrix.config.experimental }}
2424
env:
25-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.3,pypy-3.6,pypy-3.7,pypy-3.8'
25+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.6,pypy-3.7,pypy-3.8'
2626

2727
strategy:
2828
fail-fast: False
@@ -33,7 +33,7 @@ jobs:
3333
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3434
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
3535
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
36-
- {python-version: "3.11.0-alpha.3", testenvs: "py311-dev,build", experimental: True}
36+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3737
- {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False}
3838
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3939
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
@@ -180,7 +180,7 @@ jobs:
180180
- name: Install dependencies 🔧
181181
run: |
182182
python -m pip install --upgrade pip setuptools wheel
183-
python -m pip install --upgrade mkrecipe
183+
python -m pip install --upgrade "mkrecipe" "whey" "whey-pth"
184184
185185
wget https://repo.anaconda.com/miniconda/Miniconda3-py38_4.10.3-Linux-x86_64.sh -O miniconda.sh
186186
bash miniconda.sh -b -p $HOME/miniconda

.github/workflows/python_ci_macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: "macos-latest"
2222
continue-on-error: ${{ matrix.config.experimental }}
2323
env:
24-
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.3,pypy-3.7,pypy-3.8'
24+
USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11.0-alpha.4,pypy-3.7,pypy-3.8'
2525

2626
strategy:
2727
fail-fast: False
@@ -32,7 +32,7 @@ jobs:
3232
- {python-version: "3.8", testenvs: "py38,build", experimental: False}
3333
- {python-version: "3.9", testenvs: "py39,build", experimental: False}
3434
- {python-version: "3.10", testenvs: "py310,build", experimental: False}
35-
- {python-version: "3.11.0-alpha.3", testenvs: "py311-dev,build", experimental: True}
35+
- {python-version: "3.11.0-alpha.4", testenvs: "py311-dev,build", experimental: True}
3636
- {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: True}
3737
- {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: True}
3838

tox.ini

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ envlist =
3030
skip_missing_interpreters = True
3131
isolated_build = True
3232
requires =
33-
pip>=20.3.3
33+
pip>=21
3434
tox-envlist>=0.2.1
35-
tox-pip-version>=0.0.7
3635

3736
[envlists]
3837
test = py36, py37, py38, py39, py310, py311-dev, pypy36, pypy37, pypy38
@@ -51,7 +50,6 @@ commands =
5150
[testenv:docs]
5251
setenv = SHOW_TODOS = 1
5352
basepython = python3.8
54-
pip_version = pip>=21
5553
changedir = {toxinidir}/doc-source
5654
deps = -r{toxinidir}/doc-source/requirements.txt
5755
commands = sphinx-build -M {env:SPHINX_BUILDER:html} . ./build {posargs}

0 commit comments

Comments
 (0)