Skip to content

Commit

Permalink
Merge pull request #53 from jag1g13/dev
Browse files Browse the repository at this point in the history
Rename `master` branch to `main`
  • Loading branch information
jag1g13 authored Mar 16, 2022
2 parents d8b6cd7 + 8f755dd commit cfe983b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ name: Python package

on:
push:
branches: [ master, dev ]
branches: [ main, dev ]
pull_request:
branches: [ master, dev ]
branches: [ main, dev ]

jobs:
build:
Expand Down Expand Up @@ -42,10 +42,9 @@ jobs:
# This path is specific to Ubuntu
path: ${{ steps.pip-cache.outputs.dir }}
# Look to see if there is a cache hit for the corresponding requirements file
key: ${{ runner.os }}-pip-${{ hashFiles('pyproject.toml') }}
key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('pyproject.toml') }}
restore-keys: |
${{ runner.os }}-pip-
${{ runner.os }}-
${{ runner.os }}-${{ matrix.python-version }}-pip-
- name: Install dependencies
run: |
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.0.0](https://github.com/jag1g13/pycgtool/compare/v2.0.0-beta.5...v2.0.0) (2022-03-16)

## [2.0.0-beta.5](https://github.com/jag1g13/pycgtool/compare/v1.0.2...v2.0.0-beta.5) (2021-11-14)


Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ Input to PyCGTOOL is an atomistic simulation trajectory in the form of a topolog
These files provide the atomistic-to-CG mapping and bonded topology respectively and use a format similar to GROMACS `.itp` files.
Topology and trajectory files are processed using [MDTraj](https://www.mdtraj.org) so most common formats are accepted.

Example mapping and bond files are present in the [test/data](https://github.com/jag1g13/pycgtool/tree/master/test/data) directory.
Example mapping and bond files are present in the [test/data](https://github.com/jag1g13/pycgtool/tree/main/test/data) directory.
The format of these files is described fully in the [documentation page on file formats](https://pycgtool.readthedocs.io/en/dev/file-formats.html).

For more information, see [the tutorial](https://pycgtool.readthedocs.io/en/master/tutorial.html).
For more information, see [the tutorial](https://pycgtool.readthedocs.io/en/main/tutorial.html).
It is important to perform validation of any new parameter set - a brief example is present at the end of the tutorial.

For a full list of options, see the [documentation](https://pycgtool.readthedocs.io/en/master/index.html) or use:
For a full list of options, see the [documentation](https://pycgtool.readthedocs.io/en/main/index.html) or use:
```
pycgtool -h
```
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[tool.poetry]
name = "pycgtool"
version = "2.0.0-beta.5"
version = "2.0.0"
description = "Generate coarse-grained molecular dynamics models from atomistic trajectories."
authors = ["James Graham <[email protected]>"]
license = "GPL-3.0-only"

readme = "README.md"
homepage = "https://github.com/jag1g13/pycgtool"
repository = "https://github.com/jag1g13/pycgtool"
documentation = "https://pycgtool.readthedocs.io/en/master/"
documentation = "https://pycgtool.readthedocs.io/en/main/"

keywords = [
"molecular-dynamics",
Expand Down

0 comments on commit cfe983b

Please sign in to comment.