Skip to content

Commit

Permalink
Merge pull request #171 from duartegroup/v1.3.0
Browse files Browse the repository at this point in the history
v1.3.0
  • Loading branch information
t-young31 committed Oct 1, 2022
2 parents d59fab9 + ef881a8 commit 5166fc1
Show file tree
Hide file tree
Showing 169 changed files with 6,531 additions and 3,978 deletions.
6 changes: 5 additions & 1 deletion .github/workflows/catch.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: catch

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

env:
BUILD_TYPE: Release
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: pytest

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
test:
Expand All @@ -11,7 +15,7 @@ jobs:
fail-fast: true
matrix:
os: ["ubuntu-latest", "macos-latest"]
python-version: ["3.7", "3.8", "3.9"]
python-version: ["3.8", "3.9", "3.10"]

defaults:
run:
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/pytest_cov.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
name: pytest_codecov

on: [push, pull_request]
on:
push:
branches:
- master
pull_request:

jobs:
test:
Expand All @@ -11,8 +15,8 @@ jobs:
fail-fast: true
matrix:
os: ["ubuntu-latest"]
python-version: ["3.7", "3.9"]
python-version: ["3.10"]

defaults:
run:
shell: bash -l {0}
Expand All @@ -36,9 +40,9 @@ jobs:
- name: Test
run: |
py.test --cov-report xml --cov autode tests/
- uses: codecov/codecov-action@v2
pytest --cov=./ --cov-report=xml
- uses: codecov/codecov-action@v3
with:
flags: unittests
fail_ci_if_error: true
53 changes: 11 additions & 42 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,52 +1,21 @@
\build/

\dist/

\.idea/

autode/__pycache__/

**__MACOSX/
autode/ext/*.cpp
**cmake-build-debug/
autode/ext/CMakeFiles/
**/__pycache__/
autode\.egg-info/

doc/_build/
**.DS_Store
**htmlcov/
.coverage

coverage.xml

tests/__pycache__/

tests/*.xyz

**/tmp.xyz

autode/conformers/__pycache__/

autode/transition_states/__pycache__/

autode/conformers/cconf_gen.c

autode/solvent/csolvent.c

doc/_build/
.DS_Store

tests/htmlcov/

*.c
*.so
*.inp

*.pyc

htmlcov/

tests/.autode_calculations

tests/*/__MACOSX/

tests/data/conformers/.autode_calculations

autode/ext/*.cpp

autode/ext/cmake-build-debug/

autode/ext/CMakeFiles/

autode/ext/cmake-build-debug*/
**.autode_calculations
25 changes: 12 additions & 13 deletions autode/__init__.py
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
from autode.wrappers.keywords import (KeywordsSet, OptKeywords,
HessianKeywords, SinglePointKeywords,
Keywords, GradientKeywords)
from autode.reactions.reaction import Reaction
from autode.reactions.multistep import MultiStepReaction
from autode.atoms import Atom
from autode.species.molecule import (Reactant, Product, Molecule, Species)
from autode.species.complex import NCIComplex
from autode.config import Config
from autode.calculation import Calculation
from autode import methods
from autode import geom
from autode import pes
from autode import utils
from autode import neb
from autode import mol_graphs
from autode import hessians

from autode.reactions.reaction import Reaction
from autode.reactions.multistep import MultiStepReaction
from autode.atoms import Atom
from autode.species.molecule import (Reactant, Product, Molecule, Species)
from autode.species.complex import NCIComplex
from autode.config import Config
from autode.calculations import Calculation
from autode.wrappers.keywords import (KeywordsSet, OptKeywords,
HessianKeywords, SinglePointKeywords,
Keywords, GradientKeywords)
"""
So, you want to bump the version.. make sure the following steps are followed
Bumping the version number requires following the release proceedure:
- Update changelog (doc/changelog.rst)
Expand All @@ -33,7 +32,7 @@
- Merge when tests pass
"""

__version__ = '1.2.3'
__version__ = '1.3.0'


__all__ = [
Expand Down
Loading

0 comments on commit 5166fc1

Please sign in to comment.