Skip to content

Commit 306bde2

Browse files
committed
More github actions.
1 parent e2483e8 commit 306bde2

File tree

5 files changed

+95
-6
lines changed

5 files changed

+95
-6
lines changed

.github/workflows/docs.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
run: make -C docs
3838

3939
- name: move docs
40-
if: (!github.event.pull_request)
40+
if: github.event_name == 'push'
4141
run: |
4242
cp docs/is_new_stable.py /tmp/
4343
mv docs/_build/html /tmp/${GITHUB_REF_NAME}
@@ -49,9 +49,9 @@ jobs:
4949
ln -s ${GITHUB_REF_NAME} latest
5050
5151
- name: check if tag is new stable
52-
if: ${{ github.ref_type == 'tag' }}
52+
if: github.event_name == 'push' && github.ref_type == 'tag'
5353
run: |
54-
python -m pip install packaging==21.3
54+
python -m pip install packaging
5555
if [ -f stable ]; then
5656
export STABLE=$(readlink stable)
5757
else
@@ -66,7 +66,7 @@ jobs:
6666
fi
6767
6868
- name: commit to gh-pages
69-
if: (!github.event.pull_request)
69+
if: github.event_name == 'push'
7070
uses: stefanzweifel/git-auto-commit-action@v4
7171
with:
7272
commit_message: deploy ${{ github.ref }}

.github/workflows/tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
4646
- name: install bcftools
4747
run: |
48-
# The tests call "bgzip" and "bcftools index".
48+
# The tests call "bgzip" and "bcftools".
4949
if [ "$RUNNER_OS" == "Linux" ]; then
5050
# Ubuntu keeps bgzip in the tabix package.
5151
sudo apt-get update

.github/workflows/wheel.yaml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
name: wheel
2+
3+
on:
4+
push:
5+
tags:
6+
- '*'
7+
release:
8+
types: [published]
9+
10+
jobs:
11+
wheel_build:
12+
runs-on: ubuntu-18.04
13+
steps:
14+
- uses: actions/checkout@v2
15+
- uses: actions/setup-python@v2
16+
with:
17+
python-version: 3.8
18+
19+
- name: build wheel
20+
run: |
21+
pip install build twine
22+
python -m build
23+
twine check dist/*
24+
25+
- name: upload wheel
26+
uses: actions/upload-artifact@v2
27+
with:
28+
name: wheel-and-sdist
29+
path: dist/
30+
31+
wheel_test:
32+
runs-on: ${{ matrix.os }}
33+
needs: ['wheel_build']
34+
defaults:
35+
run:
36+
shell: bash
37+
strategy:
38+
fail-fast: false
39+
matrix:
40+
os: [ubuntu-latest, macos-latest]
41+
python-version: [3.7, 3.8, 3.9]
42+
43+
steps:
44+
- name: download wheel
45+
uses: actions/download-artifact@v2
46+
with:
47+
name: wheel-and-sdist
48+
path: dist/
49+
50+
- name: setup python
51+
uses: actions/setup-python@v2
52+
with:
53+
python-version: ${{ matrix.python-version }}
54+
55+
- name: install
56+
run: pip install dist/*.whl
57+
58+
- name: test
59+
run: |
60+
python -c "import dinf"
61+
dinf --version
62+
63+
pypi_upload:
64+
runs-on: ubuntu-18.04
65+
needs: ['wheel_test']
66+
steps:
67+
- name: download wheel
68+
uses: actions/download-artifact@v2
69+
with:
70+
name: wheel-and-sdist
71+
path: dist/
72+
73+
- name: publish to test.pypi.org
74+
if: github.event_name == 'push' && github.ref_type == 'tag'
75+
uses: pypa/gh-action-pypi-publish@release/v1
76+
with:
77+
user: __token__
78+
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
79+
repository_url: https://test.pypi.org/legacy/
80+
81+
- name: publish to PyPI
82+
if: github.event_name == 'release'
83+
uses: pypa/gh-action-pypi-publish@release/v1
84+
with:
85+
user: __token__
86+
password: ${{ secrets.PYPI_API_TOKEN }}

pyproject.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[build-system]
2+
requires = ["setuptools>=40.8.0", "wheel", "setuptools_scm"]

setup.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[metadata]
22
name = dinf
33
author = Graham Gower
4+
author_email = [email protected]
45
license = MIT
56
description = discriminator-based inference of population parameters
67
long_description = file: README.md
@@ -35,7 +36,7 @@ install_requires =
3536
jax
3637
flax
3738
optax
38-
msprime >= 1.0.3 # performance improvements
39+
msprime >= 1.0.4
3940
demes
4041
setup_requires =
4142
setuptools

0 commit comments

Comments
 (0)