Skip to content

Commit

Permalink
Merge pull request #11 from molssi-seamm/dev
Browse files Browse the repository at this point in the history
Updated to changes in newer versions of Psi4.
  • Loading branch information
seamm authored Aug 25, 2022
2 parents 005783d + 8a475a2 commit 97a08be
Show file tree
Hide file tree
Showing 16 changed files with 72 additions and 656 deletions.
52 changes: 6 additions & 46 deletions .github/workflows/BranchCI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,11 @@ on:
push:
branches-ignore:
- 'main'
- 'master'

jobs:
light-ci:
name: Lint ubuntu-latest Py3.9
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
# This gets all branches (1 = only current branch)
fetch-depth: 0
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
# More info on options: https://github.com/conda-incubator/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
# conda setup requires this special shell
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Run linters
shell: bash -l {0}
run: |
black --check --diff psi4_step tests
flake8 psi4_step tests
- name: Run tests
shell: bash -l {0}
run: |
pytest -v --cov=psi4_step --cov-report=xml --color=yes tests/
- name: CodeCov
uses: codecov/codecov-action@v2
with:
file: ./coverage.xml
flags: unittests
name: codecov-ubuntu-latest-py3.9


branch-ci:
name: Branch CI
uses: molssi-seamm/devops/.github/workflows/BranchCI.yaml@main
with:
src : psi4_step
84 changes: 5 additions & 79 deletions .github/workflows/CI.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,10 @@ on:
pull_request:
branches:
- "main"
schedule:
# Run by default Sunday morning at 3:30:
# Scheduled workflows run on the latest commit on the default or base branch.
# (from https://help.github.com/en/actions/reference/events-that-trigger-workflows#scheduled-events-schedule)
- cron: "30 3 * * 0"

jobs:
lint:
name: Lint ubuntu-latest Py3.9
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
# This gets all branches (1 = only current branch)
fetch-depth: 0
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
# More info on options: https://github.com/conda-incubator/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
# conda setup requires this special shell
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Run linters
shell: bash -l {0}
run: |
black --check --diff psi4_step tests
flake8 psi4_step tests
test:
name: Test ${{ matrix.os }} Py${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
needs: lint
strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: [3.8, 3.9]
steps:
- uses: actions/checkout@v1
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Run tests
shell: bash -l {0}
run: |
pytest -v --cov=psi4_step --cov-report=xml --color=yes tests/
- name: CodeCov
uses: codecov/codecov-action@v2
with:
file: ./coverage.xml
flags: unittests
name: codecov-${{ matrix.os }}-py${{ matrix.python-version }}
ci:
name: CI
uses: molssi-seamm/devops/.github/workflows/CI.yaml@main
with:
src : psi4_step
35 changes: 1 addition & 34 deletions .github/workflows/Docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,4 @@ on: push

jobs:
docs:
name: Docs ubuntu-latest Py3.9
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
# This gets all branches (1 = only current branch)
fetch-depth: 0
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
# More info on options: https://github.com/conda-incubator/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
# conda setup requires this special shell
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Build documentation
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
shell: bash -l {0}
run: |
docs/buildDocs.sh
uses: molssi-seamm/devops/.github/workflows/Docs.yaml@main
117 changes: 6 additions & 111 deletions .github/workflows/Release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,114 +7,9 @@ on:
- "main"

jobs:
lint:
name: Lint ubuntu-latest Py3.9
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
with:
# This gets all branches (1 = only current branch)
fetch-depth: 0
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
# More info on options: https://github.com/conda-incubator/setup-miniconda
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: 3.9
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
# conda setup requires this special shell
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Run linters
shell: bash -l {0}
run: |
black --check --diff psi4_step tests
flake8 psi4_step tests
test:
name: Test ${{ matrix.os }} Py${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
needs: lint
strategy:
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: [3.8, 3.9]
steps:
- uses: actions/checkout@v1
- name: Additional info about the build
shell: bash
run: |
uname -a
df -h
ulimit -a
- uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
environment-file: devtools/conda-envs/test_env.yaml
activate-environment: test
auto-update-conda: false
auto-activate-base: false
show-channel-urls: true
- name: Install package
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Run tests
shell: bash -l {0}
run: |
pytest -v --cov=psi4_step --cov-report=xml --color=yes tests/
- name: CodeCov
uses: codecov/codecov-action@v2
with:
file: ./coverage.xml
flags: unittests
name: codecov-${{ matrix.os }}-py${{ matrix.python-version }}

deploy:
name: PyPi ubuntu-latest Py3.9
# Run only for tagged releases publishing development or release candidates
# only to test.pypi, otherwise to both it and the main pypi.
if: github.event_name == 'release' && startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest
needs: [lint, test]
steps:
- uses: actions/checkout@v1
- name: Set up Python 3.9
uses: actions/setup-python@v1
with:
python-version: 3.9
- name: Install package
shell: bash -l {0}
run: |
python -m pip install . --no-deps
conda list
- name: Install pypa/build
run: |
python -m pip install build --user
- name: Build a binary wheel and a source tarball
run: |
python -m build --sdist --wheel --outdir dist/
ls -l dist/
- name: Publish distribution 📦 to Test PyPI
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.test_pypi_password }}
repository_url: https://test.pypi.org/legacy/
skip_existing: true
- name: Publish distribution 📦 to PyPI
if: contains(github.ref, 'dev') == false && contains(github.ref, 'rc') == false
uses: pypa/gh-action-pypi-publish@master
with:
password: ${{ secrets.pypi_password }}
release:
name: Release
uses: molssi-seamm/devops/.github/workflows/Release.yaml@main
with:
src : psi4_step
secrets: inherit
64 changes: 0 additions & 64 deletions .pyup.yml

This file was deleted.

21 changes: 0 additions & 21 deletions .readthedocs.yml

This file was deleted.

Loading

0 comments on commit 97a08be

Please sign in to comment.