Skip to content

Commit

Permalink
Merge branch 'develop' into publish-gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
atztogo committed Nov 14, 2024
2 parents 962b945 + f707cb2 commit 585d465
Show file tree
Hide file tree
Showing 14 changed files with 758 additions and 34 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: publish PyPI and TestPyPI

on:
push:
branches:
- main
- rc

jobs:
build-linux:
runs-on: ubuntu-latest
strategy:
matrix:
python-version: ["3.12"]

steps:
- uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Make sdist
run: |
git tag v`grep __version__ phelel/version.py|awk -F'"' '{print($2)}'`
pip install build
python -m build --sdist
- name: Publish package to TestPyPI
if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/rc')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.TEST_PYPI_API_TOKEN }}
repository_url: https://test.pypi.org/legacy/
- name: Publish package to PyPI
if: github.event_name == 'push' && startsWith(github.ref, 'refs/heads/main')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
shell: bash -l {0}
strategy:
matrix:
python-version: ["3.12"]
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- uses: actions/checkout@v4
Expand All @@ -34,6 +34,9 @@ jobs:
- name: Test with pytest
run: |
conda activate test
velph --help
phelel --help
phelel-load --help
pytest -v --cov=./ --cov-report=xml
- name: Upload coverage reports to Codecov
uses: codecov/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repos:
- id: check-added-large-files

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.7.0
rev: v0.7.3
hooks:
- id: ruff
args: [ "--fix", "--show-fixes" ]
Expand Down
1 change: 1 addition & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
graft test
9 changes: 8 additions & 1 deletion doc/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@

A simplest installation using conda-forge packages:

```
% conda create -n phelel -c conda-forge
% conda activate phelel
% conda install phelel
```

From source code of phelel,
```
% conda create -n phelel -c conda-forge
% conda activate phelel
Expand All @@ -24,4 +31,4 @@ A simplest installation using conda-forge packages:
% pip install -e .
```

PyPI and conda forge package will be made in the future.
The pypi package is also available.
Loading

0 comments on commit 585d465

Please sign in to comment.