Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into pip
Browse files Browse the repository at this point in the history
  • Loading branch information
rickecon committed Mar 31, 2022
2 parents db49dd9 + 4b24e2e commit 96ac423
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 1 deletion.
1 change: 0 additions & 1 deletion .github/workflows/build_and_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,3 @@ jobs:
name: codecov-umbrella
fail_ci_if_error: true
verbose: true

20 changes: 20 additions & 0 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,23 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
BRANCH: gh-pages # The branch the action should deploy to.
FOLDER: docs/book/_build/html # The folder the action should deploy.
publish:
needs: build
name: Publish to PyPI
if: github.repository == 'PSLmodels/OG-Core'
runs-on: ubuntu-latest
steps:
- name: Checkout repo
uses: actions/checkout@v2
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: 3.7
- name: Build package
run: make pip-package
- name: Publish a Python distribution to PyPI
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI }}
skip_existing: true
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,7 @@ git-sync:
.PHONY=git-pr
git-pr:
@./gitpr $(N)

pip-package:
pip install wheel
python setup.py sdist bdist_wheel

0 comments on commit 96ac423

Please sign in to comment.