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

MAINT: Update master branch after release (0.11.0) #276

Merged
merged 4 commits into from
Dec 3, 2021
Merged
Changes from all commits
Commits
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
23 changes: 15 additions & 8 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
@@ -26,7 +26,10 @@ jobs:
special: 'no optional'
version: '3.10'
- os: ubuntu-latest
special: 'slow'
special: 'CP2K 6.1'
version: '3.9'
- os: ubuntu-latest
special: 'CP2K 7.1'
version: '3.9'
- os: ubuntu-latest
special: 'CP2K 8.2'
@@ -44,15 +47,18 @@ jobs:
if: matrix.os == 'ubuntu-latest'
run: |
case "${{ matrix.special }}" in
"CP2K 8.2")
git clone https://github.com/cp2k/cp2k
"CP2K 6.1"|"CP2K 7.1"|"CP2K 8.2")
VERSION_SHORT=$(echo "${{ matrix.special }}" | grep -P -o "CP2K \K([\.0-9]+)")
VERSION=v"$VERSION_SHORT".0

git clone https://github.com/cp2k/cp2k -q
cd cp2k
git checkout tags/v8.2.0
git -c advice.detachedHead=false checkout tags/$VERSION
ln -s data /usr/share/cp2k

wget -nv https://github.com/cp2k/cp2k/releases/download/v8.2.0/cp2k-8.2-Linux-x86_64.ssmp
chmod u+rx cp2k-8.2-Linux-x86_64.ssmp
mv cp2k-8.2-Linux-x86_64.ssmp /usr/local/bin/cp2k.popt
wget -nv https://github.com/cp2k/cp2k/releases/download/$VERSION/cp2k-$VERSION_SHORT-Linux-x86_64.ssmp -O cp2k.ssmp
chmod u+rx cp2k.ssmp
mv cp2k.ssmp /usr/local/bin/cp2k.popt
;;
*)
sudo apt install cp2k ;;
@@ -76,6 +82,7 @@ jobs:
conda create -n test -c conda-forge python=${{ matrix.version }} rdkit nbsphinx jupyter pandoc
source $CONDA/bin/activate test
pip install --pre -e .[test] --upgrade --force-reinstall
pip install git+https://github.com/SCM-NV/PLAMS@master --upgrade
;;
"no optional")
conda create -n test -c conda-forge python=${{ matrix.version }}
@@ -106,7 +113,7 @@ jobs:
case "${{ matrix.special }}" in
"no optional")
pytest -m 'not (slow or long)' test ;;
"slow"|"CP2K 8.2")
"CP2K 6.1"|"CP2K 7.1"|"CP2K 8.2")
pytest -m '(slow or long)' ;;
*)
pytest -m 'not (slow or long)' ;;
2 changes: 2 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -8,6 +8,8 @@
:alt: Documentation Status
.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3274284.svg
:target: https://doi.org/10.5281/zenodo.3274284
.. image:: https://badge.fury.io/py/qmflows.svg
:target: https://badge.fury.io/py/qmflows
.. image:: qmflows.png

QMFlows
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
@@ -70,7 +70,7 @@
# The short X.Y version.
version = '0.11'
# The full version, including alpha/beta/rc tags.
release = '0.11.0'
release = '0.11.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
2 changes: 1 addition & 1 deletion src/qmflows/__version__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""The QMFlows version."""

__version__ = "0.11.0"
__version__ = "0.11.1"