Skip to content

Commit

Permalink
Some more fixes for converting from pyiron_contrib to pyiron_potentia…
Browse files Browse the repository at this point in the history
…lfit
  • Loading branch information
jan-janssen committed Oct 16, 2023
1 parent 87e37eb commit 0253f09
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 32 deletions.
1 change: 0 additions & 1 deletion .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ dependencies:
- pyiron_atomistics =0.3.4
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
- python >= 3.10
- lammps
- nglview >=3.0.8
1 change: 0 additions & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ dependencies:
- pyiron_atomistics =0.3.4
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
5 changes: 0 additions & 5 deletions .ci_support/exclude

This file was deleted.

4 changes: 2 additions & 2 deletions .coveragerc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# .coveragerc to control coverage.py
[run]
source = pyiron_contrib
omit = pyiron_contrib/_version.py
source = pyiron_potentialfit
omit = pyiron_potentialfit/_version.py
concurrency = multiprocessing
2 changes: 1 addition & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pyiron_contrib/_version.py export-subst
pyiron_potentialfit/_version.py export-subst
2 changes: 1 addition & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include versioneer.py
include pyiron_contrib/_version.py
include pyiron_potentialfit/_version.py
include LICENSE
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# pyiron_contrib
[![Documentation Status](https://readthedocs.org/projects/pyiron-contrib/badge/?version=latest)](https://pyiron-contrib.readthedocs.io/en/latest/?badge=latest)

This repository is for user developments on top of the pyiron platform, existing as a publicly accessible incubation area for new ideas. As such, code here might be very useful and cutting-edge, but comes without the level of stability or backwards compatibility associated with the main pyiron branch.
# pyiron_potentialfit
Fitting machine learning interatomic potentials with pyiron
9 changes: 0 additions & 9 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,3 @@ dependencies:
- pyiron_atomistics =0.3.4
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
- scikit-image =0.21.0
- randspg =0.0.1
- boto3 =1.28.62
- moto =4.2.5
- pycp2k =0.2.2
- aws-sam-translator =1.77.0
- pympipool =0.7.1
- distributed =2023.9.3
5 changes: 0 additions & 5 deletions pyiron_potentialfit/atomistics/job/trainingcontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,10 @@

from typing import Callable, Dict, Any, Optional

from warnings import catch_warnings

import numpy as np
import pandas as pd
import seaborn as sns
import matplotlib.pyplot as plt

from ase.atoms import Atoms as ASEAtoms

from pyiron_atomistics.atomistics.structure.atoms import Atoms
from pyiron_atomistics.atomistics.structure.has_structure import HasStructure
from pyiron_atomistics.atomistics.structure.structurestorage import (
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[versioneer]
VCS = git
style = pep440-pre
versionfile_source = pyiron_contrib/_version.py
versionfile_source = pyiron_potentialfit/_version.py
#versionfile_build =
tag_prefix = pyiron_contrib-
parentdir_prefix = pyiron_contrib
tag_prefix = pyiron_potentialfit-
parentdir_prefix = pyiron_potentialfit

0 comments on commit 0253f09

Please sign in to comment.