Skip to content

Commit

Permalink
Merge pull request #255 from SCM-NV/cp2k
Browse files Browse the repository at this point in the history
TST: Re-enable the CP2K tests
  • Loading branch information
BvB93 committed Sep 24, 2021
2 parents 4adbe04 + c3bee7d commit fe8bd15
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/pythonapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ jobs:
- uses: actions/checkout@v2

- name: Install cp2k
if: matrix.os == 'DISABLE'
if: matrix.os == 'ubuntu-latest'
run: sudo apt install cp2k --fix-missing

- name: Info CP2K
if: matrix.os == 'DISABLE'
if: matrix.os == 'ubuntu-latest'
run: cp2k.popt --version

- name: Setup conda
Expand All @@ -48,21 +48,21 @@ jobs:
- name: Install dependencies
if: matrix.special == ''
run: |
conda create -n test -c conda-forge python=${{ matrix.version }} h5py rdkit nbsphinx jupyter
conda create -n test -c conda-forge python=${{ matrix.version }} h5py rdkit nbsphinx jupyter pandoc
source $CONDA/bin/activate test
pip install -e .[test]
- name: Install dependencies (pre-release)
if: matrix.special == 'pre-release'
run: |
conda create -n test -c conda-forge python=${{ matrix.version }} h5py rdkit nbsphinx jupyter
conda create -n test -c conda-forge python=${{ matrix.version }} h5py rdkit nbsphinx jupyter pandoc
source $CONDA/bin/activate test
pip install --pre -e .[test] --upgrade --force-reinstall
- name: Install dependencies (no RDKit)
if: matrix.special == 'no RDKit'
run: |
conda create -n test -c conda-forge python=${{ matrix.version }} h5py nbsphinx jupyter
conda create -n test -c conda-forge python=${{ matrix.version }} h5py nbsphinx jupyter pandoc
source $CONDA/bin/activate test
pip install -e .[test]
Expand Down
5 changes: 0 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,6 @@
]


# Output is processed with HTML4 writer.
# Default is False.
html4_writer = True


# True to use the .. admonition:: directive for the Example and Examples sections.
# False to use the .. rubric:: directive instead. One may look better than the other depending on what HTML theme is used.
# Defaults to False.
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ def readme():
'sphinx-autodoc-typehints',
'sphinx_rtd_theme',
'nbsphinx',
'jupyter'
'jupyter',
'pandoc',
]

tests_require = [
Expand Down Expand Up @@ -78,12 +79,12 @@ def readme():
'pandas',
'noodles==0.3.3',
'plams>=1.5.1',
'pyparsing',
'pyparsing<3.0',
'pyyaml>=5.1',
'filelock',
],
extras_require={
'test': tests_require,
'doc': tests_require
'doc': docs_require,
}
)

0 comments on commit fe8bd15

Please sign in to comment.