Skip to content

Commit 52489e9

Browse files
author
SimonBoothroyd
authored
Merge pull request #191 from openforcefield/missed_files
Migrate Missed Files
2 parents ae572cb + 057ff97 commit 52489e9

File tree

12 files changed

+26
-26
lines changed

12 files changed

+26
-26
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
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 propertyestimator.
4+
describes how to merge code changes into this openff-evaluator.
55

66
## Getting Started
77

@@ -19,7 +19,7 @@ describes how to merge code changes into this propertyestimator.
1919
[branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/)
2020
with the branch name relating to the feature you are going to add.
2121
* When you are ready for others to examine and comment on your new feature,
22-
navigate to your fork of propertyestimator on GitHub and open a [pull
22+
navigate to your fork of openff-evaluator on GitHub and open a [pull
2323
request](https://help.github.com/articles/using-pull-requests/) (PR). Note that
2424
after you launch a PR from one of your fork's branches, all
2525
subsequent commits to that branch will be added to the open pull request
@@ -29,7 +29,7 @@ describes how to merge code changes into this propertyestimator.
2929
* If you're providing a new feature, you must add test cases and documentation.
3030
* When the code is ready to go, make sure you run the test suite using pytest.
3131
* When you're ready to be considered for merging, check the "Ready to go"
32-
box on the PR page to let the propertyestimator devs know that the changes are complete.
32+
box on the PR page to let the openff-evaluator devs know that the changes are complete.
3333
The code will not be merged until this box is checked, the continuous
3434
integration returns checkmarks,
3535
and multiple core developers give "Approved" reviews.

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ ENV/
112112
examples/property_estimator/stored_data/
113113
examples/property_estimator/working_directory/
114114

115-
propertyestimator/data/properties/JCT/
115+
evaluator/data/properties/JCT/
116116
*dask-worker-space/
117117

118118
integration_tests/thermoml/checked_thermoml_files
119119

120-
propertyestimator/tests/**/*dat
120+
evaluator/tests/**/*dat

MANIFEST.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ include LICENSE
22
include MANIFEST.in
33
include versioneer.py
44

5-
graft propertyestimator
5+
graft evaluator
66
global-exclude *.py[cod] __pycache__ *.so

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ OpenFF Evaluator
33
[//]: # (Badges)
44

55
[![Test Status](https://github.com/openforcefield/openff-evaluator/workflows/tests/badge.svg)](https://github.com/openforcefield/openff-evaluator/actions)
6-
[![Documentation Status](https://readthedocs.org/projects/property-estimator/badge/?version=latest)](https://property-estimator.readthedocs.io/en/latest/?badge=latest)
6+
[![Documentation Status](https://readthedocs.org/projects/openff-evaluator/badge/?version=latest)](https://openff-evaluator.readthedocs.io/en/latest/?badge=latest)
77
[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/openforcefield/openff-evaluator.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/openforcefield/openff-evaluator/context:python)
88
[![codecov](https://codecov.io/gh/openforcefield/openff-evaluator/branch/master/graph/badge.svg)](https://codecov.io/gh/openforcefield/openff-evaluator/branch/master)
99
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
1010

1111
A distributed, automated property estimation toolkit from the Open Force Field Consortium. See the
12-
[documentation](https://property-estimator.readthedocs.io) for more information.
12+
[documentation](https://openff-evaluator.readthedocs.io) for more information.
1313

1414
#### Acknowledgements
1515

devtools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ is installed by looking at the `git` tags and how many commits ahead this versio
6767
\d+.\d+.\d+(?\+\d+-[a-z0-9]+)
6868
```
6969
If the version of this commit is the same as a `git` tag, the installed version is the same as the tag,
70-
e.g. `propertyestimator-0.1.2`, otherwise it will be appended with `+X` where `X` is the number of commits
70+
e.g. `evaluator-0.1.2`, otherwise it will be appended with `+X` where `X` is the number of commits
7171
ahead from the last tag, and then `-YYYYYY` where the `Y`'s are replaced with the `git` commit hash.

docs/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# You can set these variables from the command line.
55
SPHINXOPTS =
66
SPHINXBUILD = sphinx-build
7-
SPHINXPROJ = propertyestimator
7+
SPHINXPROJ = evaluator
88
SOURCEDIR = .
99
BUILDDIR = _build
1010

docs/make.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if "%SPHINXBUILD%" == "" (
99
)
1010
set SOURCEDIR=.
1111
set BUILDDIR=_build
12-
set SPHINXPROJ=propertyestimator
12+
set SPHINXPROJ=evaluator
1313

1414
if "%1" == "" goto help
1515

docs/tutorials/tutorial01.ipynb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
"execution_count": 2,
7070
"outputs": [],
7171
"source": [
72-
"from propertyestimator.datasets.thermoml import ThermoMLDataSet"
72+
"from evaluator.datasets.thermoml import ThermoMLDataSet"
7373
],
7474
"metadata": {
7575
"collapsed": false,
@@ -294,7 +294,7 @@
294294
}
295295
],
296296
"source": [
297-
"from propertyestimator import unit\n",
297+
"from evaluator import unit\n",
298298
"\n",
299299
"print(f\"There were {len(data_set)} properties before filtering\")\n",
300300
"\n",
@@ -319,7 +319,7 @@
319319
{
320320
"cell_type": "markdown",
321321
"source": [
322-
".. note:: Here we have made use of the `propertyestimator.unit` module to attach units to the temperatures and pressures \n",
322+
".. note:: Here we have made use of the `evaluator.unit` module to attach units to the temperatures and pressures \n",
323323
" we are filtering by. This module simply exposes a `UnitRegistry` from the fantastic [pint](https://pint.readthedocs.io/en/stable/) \n",
324324
" library. Pint provides full support for attaching to units to values and is used extensively throughout this \n",
325325
" framework.\n",
@@ -431,7 +431,7 @@
431431
"execution_count": 11,
432432
"outputs": [],
433433
"source": [
434-
"from propertyestimator.thermodynamics import ThermodynamicState\n",
434+
"from evaluator.thermodynamics import ThermodynamicState\n",
435435
"\n",
436436
"thermodynamic_state = ThermodynamicState(\n",
437437
" temperature=298.15 * unit.kelvin, pressure=1.0 * unit.atmosphere\n",
@@ -459,7 +459,7 @@
459459
"execution_count": 12,
460460
"outputs": [],
461461
"source": [
462-
"from propertyestimator.substances import Substance\n",
462+
"from evaluator.substances import Substance\n",
463463
"\n",
464464
"ethanol = Substance.from_components(\"CCO\")\n",
465465
"isopropanol = Substance.from_components(\"CC(C)O\")"
@@ -486,7 +486,7 @@
486486
"execution_count": 13,
487487
"outputs": [],
488488
"source": [
489-
"from propertyestimator.datasets import MeasurementSource\n",
489+
"from evaluator.datasets import MeasurementSource\n",
490490
"\n",
491491
"source = MeasurementSource(doi=\"10.1016/S0021-9614(71)80108-8\")"
492492
],
@@ -516,8 +516,8 @@
516516
"execution_count": 14,
517517
"outputs": [],
518518
"source": [
519-
"from propertyestimator.datasets import PropertyPhase\n",
520-
"from propertyestimator.properties import EnthalpyOfVaporization\n",
519+
"from evaluator.datasets import PropertyPhase\n",
520+
"from evaluator.properties import EnthalpyOfVaporization\n",
521521
"\n",
522522
"ethanol_hvap = EnthalpyOfVaporization(\n",
523523
" thermodynamic_state=thermodynamic_state,\n",

evaluator/data/properties/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# Property Estimator Data
1+
# OpenFF Evaluator Data
22

3-
This directory contains data for running the PropertyEstimator class.
3+
This directory contains data for the OpenFF Evaluator module.
44

55
## Manifest
66

integration_tests/properties/submit_hydration_free_energy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
. ~/.bashrc
1616

1717
# Use the right conda environment
18-
conda activate propertyestimator
18+
conda activate evaluator
1919
module load cuda/10.1
2020

2121
rm -rf solvation_free_energies && mkdir solvation_free_energies && cd solvation_free_energies

0 commit comments

Comments
 (0)