Skip to content

Commit

Permalink
Merge pull request #62 from maximillian-dolan/master
Browse files Browse the repository at this point in the history
Fixed continuous integration methods
  • Loading branch information
arm61 authored Jun 11, 2024
2 parents adc8fdb + df595a2 commit 3a3c1f4
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 97 deletions.
30 changes: 30 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: python-ci

on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: ['3.9','3.10','3.11','3.12']
steps:
- uses: actions/checkout@v2
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install '.[dev]'
pip install pytest
pip install pytest-cov
- name: Generate coverage report
run: |
pytest --cov-report xml --cov=.
- name: Publish code coverage
if: github.event_name == 'push'
uses: paambaati/[email protected]
env:
CC_TEST_REPORTER_ID: ${{ secrets.CODECLIMATE_REPO_TOKEN }}
23 changes: 0 additions & 23 deletions .travis.yml

This file was deleted.

18 changes: 4 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,24 +69,14 @@ Check out some [examples](https://github.com/arm61/pylj/tree/master/examples) of
<tr>
<td>Build Status</td>
<td>
<a href="https://travis-ci.org/arm61/pylj">
<img src="https://travis-ci.org/arm61/pylj.svg?branch=master" alt="Build Status" />
</a>
</td>
</tr>
<tr>
<td></td>
<td>
<a href="https://ci.appveyor.com/project/arm61/pylj">
<img src="https://ci.appveyor.com/api/projects/status/ihtobykv8wdo6sh6?svg=true" alt="Build Status" />
</a>
</td>
<a href="https://github.com/maximillian-dolan/pylj/actions">
<img src="https://github.com/maximillian-dolan/pylj/actions/workflows/ci.yml/badge.svg" alt="Build Status" />
</tr>
<tr>
<td>Coverage Status</td>
<td>
<a href="https://coveralls.io/github/arm61/pylj?branch=master">
<img src="https://coveralls.io/repos/github/arm61/pylj/badge.svg?branch=master" alt="Coverage Status" />
<a href="https://codeclimate.com/github/maximillian-dolan/pylj/test_coverage">
<img src="https://api.codeclimate.com/v1/badges/096b85783ccdf86b4086/test_coverage" alt="Coverage Status" />
</a>
</td>
</tr>
Expand Down
57 changes: 0 additions & 57 deletions appveyor.yml

This file was deleted.

6 changes: 3 additions & 3 deletions pylj/forcefields.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from numba import njit


@njit
#Jit tag here had to be removed
def lennard_jones(dr, constants, force=False):
r"""Calculate the energy or force for a pair of particles using the
Lennard-Jones (A/B variant) forcefield.
Expand Down Expand Up @@ -38,7 +38,7 @@ def lennard_jones(dr, constants, force=False):
constants[1] * np.power(dr, -6))


@njit
#Jit tag here had to be removed
def lennard_jones_sigma_epsilon(dr, constants, force=False):
r"""Calculate the energy or force for a pair of particles using the
Lennard-Jones (sigma/epsilon variant) forcefield.
Expand Down Expand Up @@ -74,7 +74,7 @@ def lennard_jones_sigma_epsilon(dr, constants, force=False):
4 * constants[1] * np.power(constants[0], 6) * np.power(dr, -6))


@njit
#Jit tag here had to be removed
def buckingham(dr, constants, force=False):
r""" Calculate the energy or force for a pair of particles using the
Buckingham forcefield.
Expand Down

0 comments on commit 3a3c1f4

Please sign in to comment.