Skip to content

Commit

Permalink
Move confpass install to required
Browse files Browse the repository at this point in the history
  • Loading branch information
jessbade committed Apr 2, 2024
1 parent 2c5e3ce commit cafb42c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 13 deletions.
2 changes: 2 additions & 0 deletions conda-recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ requirements:
- snakemake >=6.3.0
- statsmodels >=0.11.1
- xtb >=6.5.1
- pip:
- git+https://github.com/Goodman-lab/CONFPASS.git

test:
imports:
Expand Down
12 changes: 1 addition & 11 deletions isicle/conformers.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@
from isicle.utils import TypedList, safelist, mkdtemp
from rdkit import Chem
from rdkit.Chem import PropertyMol

try:
from confpass import confpass
except ImportError:
confpass = None
from confpass import confpass


def _function_selector(func):
Expand Down Expand Up @@ -630,12 +626,6 @@ class ConfpassEnsemble(ConformationalEnsemble):
_default_value = None

def __init__(self, *args, **kwargs):
if confpass is None:
raise ImportError(
"The confpass module is required to use this feature."
"Please install it with 'pip install isicle[confpass]'."
)

super().__init__(*args)
self.__dict__.update(dict.fromkeys(self._defaults, self._default_value))
self.__dict__.update(**kwargs)
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ pandas >= 1.1.4
# rdkit >= 2023.09.1
snakemake >= 6.3.0
statsmodels >= 0.11.1
git+https://github.com/Goodman-lab/CONFPASS.git; extra == "confpass"
git+https://github.com/Goodman-lab/CONFPASS.git
1 change: 0 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
packages=pkgs,
python_requires="==3.9.*",
install_requires=install_requires,
extras_requires={"confpass": ["git+https://github.com/Goodman-lab/CONFPASS.git"]},
classifiers=[
"Intended Audience :: Science/Research",
"Topic :: Scientific/Engineering :: Chemistry",
Expand Down

0 comments on commit cafb42c

Please sign in to comment.