Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added compatibility with MDAnalysis 2.4 #36

Merged
merged 28 commits into from
Feb 3, 2023
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
38d33d6
Added compatibility with MDAnalysis 2.4
ianmkenney Jan 27, 2023
c8b0c70
Added GitHub actions workflow
ianmkenney Jan 27, 2023
29ed5f0
updated dev environment requiremnets
ianmkenney Jan 27, 2023
10f0dc1
`pytest -n` from a plugin?
ianmkenney Jan 27, 2023
378d368
Missing pkatraj variable in revised test
ianmkenney Jan 27, 2023
6f2eb4e
Including pylintrc from MDAKit cookiecutter
ianmkenney Jan 27, 2023
ac8aedf
Python 2 style super call confuses pylint?
ianmkenney Jan 27, 2023
80109b0
Added GitHub CI badge for master
ianmkenney Jan 31, 2023
01b757f
Removed find_packages import, added py3.8+ requirement, removed six i…
ianmkenney Jan 31, 2023
7d3c2a5
Added py311 to tested versions
ianmkenney Jan 31, 2023
7af70dd
MDA>=2.0.0 needed, remove six
ianmkenney Jan 31, 2023
8c1dc3b
Remove support for selection by index/list
ianmkenney Jan 31, 2023
8899c76
test_single_frame_regression parameters changed
ianmkenney Jan 31, 2023
e9def9e
Pylint probably failing because MDA not installed
ianmkenney Jan 31, 2023
ebcbad9
Fix required python and MDA versions
ianmkenney Jan 31, 2023
8bb8e13
Removed __future__ imports
ianmkenney Feb 1, 2023
35c7a61
Formatting for gh-ci.yaml
ianmkenney Feb 2, 2023
192d62d
Moved all results from PropkaTraj to results container
ianmkenney Feb 2, 2023
1e50bf4
Improved selection handling of test_single_frame_regression
ianmkenney Feb 2, 2023
6e25161
Set license to GPLv2+
ianmkenney Feb 2, 2023
fa47c3e
Simplified test_single_frame_regression
ianmkenney Feb 2, 2023
e53620b
Updated documentation to reflect the use of the `results` container
ianmkenney Feb 3, 2023
d511a44
Example notebook should use container
ianmkenney Feb 3, 2023
963c285
documentation updates
orbeckst Feb 3, 2023
efee7e5
fixed my doc changes
orbeckst Feb 3, 2023
626144a
more docs update
orbeckst Feb 3, 2023
6bfed36
docfix
orbeckst Feb 3, 2023
3bee6ca
Formatting and license fix
ianmkenney Feb 3, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
141 changes: 141 additions & 0 deletions .github/workflows/gh-ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
name: GH Actions CI
on:
push:
branches:
- master
- dev
pull_request:
branches:
- master
- dev
schedule:
- cron: "0 0 * * 0"

concurrency:
group: ${{ github.ref }}-${{ github.head_ref }}-${{ github.workflow }}
cancel-in-progress: true

defaults:
run:
shell: bash -l {0}

jobs:
environment-config:
runs-on: ubuntu-latest
outputs:
stable-python-version: ${{ steps.get_python_version.outputs.python-version }}
steps:
- uses: actions/checkout@v3

- id: get-python-version
uses: MDAnalysis/get-latest-python-version@main
with:
last-n-minor-release: 1

main-tests:
if: "github.repository == 'Becksteinlab/propkatraj'"
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
os: [macOS-latest, ubuntu-latest, windows-latest]
python-version: ["3.8", "3.9", "3.10", "3.11"]
mdanalysis-version: ["latest", "develop"]

steps:
- uses: actions/checkout@v3
- name: Build information
run: |
uname -a
df -h
ulimit -a

- name: Install conda dependencies
uses: conda-incubator/setup-miniconda@v2
with:
python-version: ${{ matrix.python-version }}
environment-file: devtools/environment.yml
add-pip-as-python-dependency: true
architecture: x64

miniforge-variant: Mambaforge
use-mamba: true
channels: conda-forge, defaults

activate-environment: propkatraj-test
auto-update-conda: true
auto-activate-base: false
show-channel-urls: true

- name: Install MDAnalysis version
uses: MDAnalysis/install-mdanalysis@main
with:
version: ${{ matrix.mdanalysis-version }}
install-tests: true
installer: mamba
shell: bash -l {0}

- name: Install package
run: |
python --version
python -m pip install . --no-deps
- name: Python information
run: |
which python
which pip
pip list
conda info
conda list
- name: Run tests
run: |
pytest -v --color=yes propkatraj/tests/

pylint_check:
if: "github.repository == 'Becksteinlab/propkatraj'"
needs: environment-config
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: ${{ needs.environment-config.outputs.stable-python-version }}

- name: Install Pylint
run: |
which pip
which python
pip install pylint MDAnalysis>=2.0.0
- name: Run Pylint
env:
PYLINTRC: .pylintrc
run: |
pylint propkatraj

pypi_check:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
pypi_check:
pypi_check:

as above, empty line consistency

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's some empty line consistency issues all over this yaml 🤣 it's not technically incorrect so I won't block over it, but I don't know how I'm the only one feeling anxious looking at the formatting..

if: "github.repository == 'Becksteinlab/propkatraj'"
needs: environment-config
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3

- name: Set up Python ${{ needs.environment-config.outputs.stable-python-version }}
uses: actions/setup-python@v4
with:
python-version: ${{ needs.environment-config.outputs.stable-python-version }}

- name: Install dependencies
run: |
pip install setuptools cython numpy twine
- name: Build package
run: |
python setup.py sdist
- name: Check package build
run: |
DISTRIBUTION=$(ls -t1 dist/propkatraj-*.tar.gz | head -n 1)
test -n "${DISTRIBUTION}" || { echo "no distribution dist/propkatraj-*.tar.gz found"; exit 1; }
echo "twine check $DISTRIBUTION"
twine check $DISTRIBUTION
Loading