Merge pull request #61 from molssi-seamm/dev

Switching to new style of documentation.
molssi-seamm · Feb 7, 2023 · a047442 · a047442
2 parents 4d3b0d9 + e8b3bae
commit a047442
Show file tree

Hide file tree

Showing 38 changed files with 473 additions and 388 deletions.
diff --git a/.github/workflows/BranchCI.yaml b/.github/workflows/BranchCI.yaml
@@ -4,47 +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
-    - 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 seamm_ff_util tests
-        flake8 seamm_ff_util tests
-    - name: Run tests
-      shell: bash -l {0}
-      run: |
-        pytest -v --cov=seamm_ff_util --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 : seamm_ff_util
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -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 seamm_ff_util tests
-        flake8 seamm_ff_util 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=seamm_ff_util --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 : seamm_ff_util
diff --git a/.github/workflows/CodeQL.yaml b/.github/workflows/CodeQL.yaml
@@ -0,0 +1,13 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+
+jobs:
+  codeql:
+    name: CodeQL
+    uses: molssi-seamm/devops/.github/workflows/CodeQL.yaml@main
diff --git a/.github/workflows/Docs.yaml b/.github/workflows/Docs.yaml
diff --git a/.github/workflows/Release.yaml b/.github/workflows/Release.yaml
@@ -7,111 +7,9 @@ on:
       - "main"
 
 jobs:
-  lint:
-    name: Lint ubuntu-latest Py3.9
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v1
-    - 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 seamm_ff_util tests
-        flake8 seamm_ff_util 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=seamm_ff_util --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 : seamm_ff_util
+    secrets: inherit
diff --git a/BranchCI.yaml b/BranchCI.yaml
@@ -0,0 +1,14 @@
+name: BranchCI
+
+on:
+  push:
+    branches-ignore:
+      - 'main'
+      - 'master'
+
+jobs:
+  branch-ci:
+    name: Branch CI
+    uses: molssi-seamm/devops/.github/workflows/BranchCI.yaml@main
+    with:
+      src : lammps_step
diff --git a/CI.yaml b/CI.yaml
@@ -0,0 +1,21 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+  schedule:
+    # Run on master 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:
+  ci:
+    name: CI
+    uses: molssi-seamm/devops/.github/workflows/CI.yaml@main
+    with:
+      src : lammps_step
diff --git a/CodeQL.yaml b/CodeQL.yaml
@@ -0,0 +1,13 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "main" ]
+
+jobs:
+  codeql:
+    name: CodeQL
+    uses: molssi-seamm/devops/.github/workflows/CodeQL.yaml@main
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -2,7 +2,18 @@
 History
 =======
 
-0.1.0 (2017-12-05)
-------------------
+2023.2.6 -- Added handling of OPLS-AA forcefield
+   * Added handling of the OPLS-AA forcefield
+   * Moved documentation to new MolSSI theme and diátaxis layout
+   * Cleaned up internal dependencies and workflows for GitHub
 
-* First release on PyPI.
+2022.5.29 -- Fixed bug typing larger systems
+   * Fixed bug with atom typing due to limit in matches. by @paulsaxe in #59
+
+2022.2.3 -- Fixed bug due to changing ordering of atoms.
+   * Fixed bug with atom type assignment due to changed order of atoms. In the process,
+     switch to using RDKit directly, which is both more direct and avoids the ordering
+     problem.
+
+0.1.0 -- (2017-12-05)
+   * First release on PyPI.