Skip to content

Commit

Permalink
Merge pull request #160 from halomod/dependabot/pip/wheel-0.38.1
Browse files Browse the repository at this point in the history
chore(deps-dev): bump wheel from 0.31.0 to 0.38.1
  • Loading branch information
steven-murray authored Dec 28, 2022
2 parents 2273f87 + 78c1325 commit f7b3bb5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 25 deletions.
18 changes: 5 additions & 13 deletions .github/workflows/publish-to-pypi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: push
jobs:
build-n-publish:
name: Deploy
runs-on: ubuntu-18.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@master
# https://github.com/ansible/pylibssh/blob/1e7b17f/.github/workflows/build-test-n-publish.yml#L146-L151
Expand All @@ -15,10 +15,10 @@ jobs:
git fetch --depth=1 origin +refs/tags/*:refs/tags/*
git describe --tags
git describe --tags $(git rev-list --tags --max-count=1)
- name: Set up Python 3.7
uses: actions/setup-python@v1
- name: Set up Python 3.10
uses: actions/setup-python@v4
with:
python-version: 3.7
python-version: "3.10"
- name: Install pep517
run: |
python -m pip install pep517 --user
Expand All @@ -33,18 +33,10 @@ jobs:
echo "SETUPTOOLS_SCM_PRETEND_VERSION=$version" >> $GITHUB_ENV
- name: Build a binary wheel and a source tarball
run: python -m pep517.build --binary --source --out-dir dist .
# deploy to Test PyPI on any push except when merging to master, since that will
# already exist, and thus fail.
- name: Publish distribution 📦 to Test PyPI
if: ${{ !contains(github.ref, 'master') }}
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.test_pypi_password }}
repository_url: https://test.pypi.org/legacy/
# deploy to actual PyPI only when a tag is pushed (which should happen only
# automatically on master)
- name: Publish distribution 📦 to PyPI
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@master
uses: pypa/gh-action-pypi-publish@release/v1
with:
password: ${{ secrets.pypi_password }}
14 changes: 3 additions & 11 deletions .github/workflows/test_suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,16 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest]
python-version: [3.8, 3.9, "3.10"]
python-version: [3.8, 3.9, "3.10", "3.11"]
steps:
- uses: actions/checkout@master
with:
fetch-depth: 1
- uses: actions/setup-python@v4
with:
python-version: ${{ matrix.python-version }}
- name: Symlink gfortran (macOS)
if: runner.os == 'macOS'
run: |
# make sure gfortran is available
# https://github.com/actions/virtual-environments/issues/2524
# https://github.com/cbg-ethz/dce/blob/master/.github/workflows/pkgdown.yaml
sudo ln -s /usr/local/bin/gfortran-10 /usr/local/bin/gfortran
sudo mkdir /usr/local/gfortran
sudo ln -s /usr/local/Cellar/gcc@10/*/lib/gcc/10 /usr/local/gfortran/lib
gfortran --version
- name: Setup GNU Fortran
uses: modflowpy/[email protected]
- name: Install
run: pip install .[dev]
- name: Run Tests
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"esbonio.sphinx.confDir": ""
}
2 changes: 1 addition & 1 deletion requirements_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ Sphinx==1.7.5
sphinx_rtd_theme
sympy==1.1.1
tox==3.0.0
wheel==0.31.0
wheel==0.38.1

0 comments on commit f7b3bb5

Please sign in to comment.