Skip to content

Commit

Permalink
Merge branch 'rc' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
atztogo committed Sep 23, 2021
2 parents 992e138 + 32a8b95 commit ff32959
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 5 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/publish-to-test-pypi.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: publish PyPI and TestPyPI

on: push

jobs:
build-linux:
runs-on: ubuntu-latest
strategy:
max-parallel: 5

steps:
- uses: actions/checkout@v2
- name: Set up Python 3.8
uses: actions/setup-python@v2
with:
python-version: 3.8
- name: Make sdist and bdist_wheel
run: |
pip install wheel
python setup.py sdist bdist_wheel
- 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/master')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
4 changes: 4 additions & 0 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
graft example
include setup.json
include LICENSE
include pyproject.toml
2 changes: 1 addition & 1 deletion aiida_phonopy/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.4"
__version__ = "0.5.2"
8 changes: 4 additions & 4 deletions setup.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aiida-phonopy",
"version": "0.4",
"version": "0.5.2",
"description": "AiiDA plugin for running phonon calculations using phonopy",
"author": "Atsushi Togo",
"author_email": "atz.togo@gmail.com",
Expand All @@ -17,11 +17,11 @@
],
"license": "MIT license",
"install_requires": [
"phonopy>=2.9.3",
"phonopy>=2.11.0",
"numpy",
"seekpath",
"aiida-core>=1.6.3,<2.0.0",
"aiida-vasp>=2.0.0"
"aiida-core>=1.6.5,<2.0.0",
"aiida-vasp>=2.1.1"
],
"setup_requires": [
"reentry"
Expand Down

0 comments on commit ff32959

Please sign in to comment.