Skip to content

Commit c248a23

Browse files
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
1 parent d5f5907 commit c248a23

File tree

16 files changed

+35
-36
lines changed

16 files changed

+35
-36
lines changed

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ comment:
1111
branches: null
1212
behavior: default
1313
flags: null
14-
paths: null
14+
paths: null

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# How to contribute
22

33
We welcome contributions from external contributors, and this document
4-
describes how to merge code changes into this ffsettings.
4+
describes how to merge code changes into this ffsettings.
55

66
## Getting Started
77

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ Notable points that this PR has either accomplished or will accomplish.
99
- [ ] Question1
1010

1111
## Status
12-
- [ ] Ready to go
12+
- [ ] Ready to go

.github/workflows/clean_cache.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@ jobs:
1111
steps:
1212
- name: Check out code
1313
uses: actions/checkout@v3
14-
14+
1515
- name: Cleanup
1616
run: |
1717
gh extension install actions/gh-actions-cache
18-
18+
1919
REPO=${{ github.repository }}
2020
BRANCH="refs/pull/${{ github.event.pull_request.number }}/merge"
2121
2222
echo "Fetching list of cache key"
2323
cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH | cut -f 1 )
2424
25-
## Setting this to not fail the workflow while deleting cache keys.
25+
## Setting this to not fail the workflow while deleting cache keys.
2626
set +e
2727
echo "Deleting caches..."
2828
for cacheKey in $cacheKeysForPR

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ Copyright (c) 2023, Chodera Lab
1313

1414

1515
#### Acknowledgements
16-
17-
Project based on the
16+
17+
Project based on the
1818
[Computational Molecular Science Python Cookiecutter](https://github.com/molssi/cookiecutter-cms) version 2.0.

devtools/README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
# Development, testing, and deployment tools
22

3-
This directory contains a collection of tools for running Continuous Integration (CI) tests,
3+
This directory contains a collection of tools for running Continuous Integration (CI) tests,
44
conda installation, and other development tools not directly related to the coding process.
55

66

77
## Manifest
88

99
### Continuous Integration
1010

11-
You should test your code, but do not feel compelled to use these specific programs. You also may not need Unix and
11+
You should test your code, but do not feel compelled to use these specific programs. You also may not need Unix and
1212
Windows testing if you only plan to deploy on specific platforms. These are just to help you get started.
1313

1414
### Conda Environment:
@@ -17,7 +17,7 @@ This directory contains the files to setup the Conda environment for testing pur
1717

1818
* `conda-envs`: directory containing the YAML file(s) which fully describe Conda Environments, their dependencies, and those dependency provenance's
1919
* `test_env.yaml`: Simple test environment file with base dependencies. Channels are not specified here and therefore respect global Conda configuration
20-
20+
2121
### Additional Scripts:
2222

2323
This directory contains OS agnostic helper scripts which don't fall in any of the previous categories
@@ -40,17 +40,17 @@ This directory contains OS agnostic helper scripts which don't fall in any of th
4040
- [ ] Make sure there is an/are issue(s) opened for your specific update
4141
- [ ] Create the PR, referencing the issue
4242
- [ ] Debug the PR as needed until tests pass
43-
- [ ] Tag the final, debugged version
43+
- [ ] Tag the final, debugged version
4444
* `git tag -a X.Y.Z [latest pushed commit] && git push --follow-tags`
4545
- [ ] Get the PR merged in
4646

4747
## Versioneer Auto-version
48-
[Versioneer](https://github.com/warner/python-versioneer) will automatically infer what version
49-
is installed by looking at the `git` tags and how many commits ahead this version is. The format follows
48+
[Versioneer](https://github.com/warner/python-versioneer) will automatically infer what version
49+
is installed by looking at the `git` tags and how many commits ahead this version is. The format follows
5050
[PEP 440](https://www.python.org/dev/peps/pep-0440/) and has the regular expression of:
5151
```regexp
5252
\d+.\d+.\d+(?\+\d+-[a-z0-9]+)
5353
```
54-
If the version of this commit is the same as a `git` tag, the installed version is the same as the tag,
55-
e.g. `ffsettings-0.1.2`, otherwise it will be appended with `+X` where `X` is the number of commits
54+
If the version of this commit is the same as a `git` tag, the installed version is the same as the tag,
55+
e.g. `ffsettings-0.1.2`, otherwise it will be appended with `+X` where `X` is the number of commits
5656
ahead from the last tag, and then `-YYYYYY` where the `Y`'s are replaced with the `git` commit hash.

devtools/scripts/create_conda_env.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
except (KeyError, ImportError, IndexError):
2929
raise ImportError("No YAML parser could be found in this or the conda environment. "
3030
"Could not find PyYAML or Ruamel YAML in the current environment, "
31-
"AND could not find Ruamel YAML in the base conda environment through CONDA_EXE path. "
31+
"AND could not find Ruamel YAML in the base conda environment through CONDA_EXE path. "
3232
"Environment not created!")
3333
loader = yaml.YAML(typ="safe").load # typ="safe" avoids odd typing on output
3434

@@ -57,10 +57,10 @@ def temp_cd():
5757
args = parser.parse_args()
5858

5959
# Open the base file
60-
with open(args.conda_file, "r") as handle:
60+
with open(args.conda_file) as handle:
6161
yaml_script = loader(handle.read())
6262

63-
python_replacement_string = "python {}*".format(args.python)
63+
python_replacement_string = f"python {args.python}*"
6464

6565
try:
6666
for dep_index, dep_value in enumerate(yaml_script['dependencies']):
@@ -82,14 +82,14 @@ def temp_cd():
8282
if conda_path is None:
8383
raise RuntimeError("Could not find a conda binary in CONDA_EXE variable or in executable search path")
8484

85-
print("CONDA ENV NAME {}".format(args.name))
86-
print("PYTHON VERSION {}".format(args.python))
87-
print("CONDA FILE NAME {}".format(args.conda_file))
88-
print("CONDA PATH {}".format(conda_path))
85+
print(f"CONDA ENV NAME {args.name}")
86+
print(f"PYTHON VERSION {args.python}")
87+
print(f"CONDA FILE NAME {args.conda_file}")
88+
print(f"CONDA PATH {conda_path}")
8989

9090
# Write to a temp directory which will always be cleaned up
9191
with temp_cd():
9292
temp_file_name = "temp_script.yaml"
9393
with open(temp_file_name, 'w') as f:
9494
f.write(yaml.dump(yaml_script))
95-
sp.call("{} env create -n {} -f {}".format(conda_path, args.name, temp_file_name), shell=True)
95+
sp.call(f"{conda_path} env create -n {args.name} -f {temp_file_name}", shell=True)

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ help:
1717
# Catch-all target: route all unknown targets to Sphinx using the new
1818
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
1919
%: Makefile
20-
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
20+
@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

docs/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ The docs for this project are built with [Sphinx](http://www.sphinx-doc.org/en/m
44
To compile the docs, first ensure that Sphinx and the ReadTheDocs theme are installed.
55

66
```bash
7-
conda install sphinx sphinx_rtd_theme
7+
conda install sphinx sphinx_rtd_theme
88
```
99

1010
Once installed, you can use the `Makefile` in this directory to compile static HTML pages by
1111
```bash
1212
make html
1313
```
1414

15-
The compiled docs will be in the `_build` directory and can be viewed by opening `index.html` (which may itself
15+
The compiled docs will be in the `_build` directory and can be viewed by opening `index.html` (which may itself
1616
be inside a directory called `html/` depending on what version of Sphinx is installed).
1717

1818
A configuration file for [Read The Docs](https://readthedocs.org/) (readthedocs.yaml) is included in the top level of the repository. To use Read the Docs to host your documentation, go to https://readthedocs.org/ and connect this repository. You may need to change your default branch to `main` under Advanced Settings for the project.

docs/_static/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Static Doc Directory
22

33
Add any paths that contain custom static files (such as style sheets) here,
4-
relative to the `conf.py` file's directory.
4+
relative to the `conf.py` file's directory.
55
They are copied after the builtin static files,
66
so a file named "default.css" will overwrite the builtin "default.css".
77

8-
The path to this folder is set in the Sphinx `conf.py` file in the line:
8+
The path to this folder is set in the Sphinx `conf.py` file in the line:
99
```python
1010
templates_path = ['_static']
1111
```

0 commit comments

Comments
 (0)