Skip to content

Commit

Permalink
Remove useless chainmap dependency (#2799)
Browse files Browse the repository at this point in the history
It seems the dependency was introduced together with the caching
mechanism but ended up not being used at all.
  • Loading branch information
ltalirz authored and sphuber committed Apr 29, 2019
1 parent aaa8c68 commit 300903f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,8 @@ before_install:
install:
# Upgrade pip setuptools and wheel to be able to run the next command
- pip install -U pip==18.1 wheel setuptools coveralls
# Need numpy version that is compatible with pymatgen, see #2420
# Specifying it in pyproject.toml is not sufficient for travis (unknown reason)
- pip install numpy==1.15.4
# Install AiiDA with some optional dependencies
- if [ "$TEST_TYPE" == "docs" ]; then pip install . && pip install -r docs/requirements_for_rtd.txt; else pip install .[all]; fi
- if [ "$TEST_TYPE" == "docs" ]; then pip install --no-cache-dir . && pip install --no-cache-dir -r docs/requirements_for_rtd.txt; else pip install .[all]; fi

env:
## Build matrix to test both backends, and the docs
Expand Down
4 changes: 0 additions & 4 deletions aiida/common/caching.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@
import copy
from functools import wraps
from contextlib import contextmanager
try:
from collections import ChainMap
except ImportError:
from chainmap import ChainMap

import yaml
from plum.util import load_class
Expand Down
2 changes: 1 addition & 1 deletion aiida/work/workfunction.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ def wrapped_function(*args, **kwargs):
return results

wrapped_function._is_workfunction = True
return wrapped_function
return wrapped_function
1 change: 0 additions & 1 deletion docs/requirements_for_rtd.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ anyjson==0.3.3
ase==3.12.0
billiard==3.3.0.23
celery==3.1.25
chainmap
click-plugins==1.0.3
click-spinner==0.1.7
click==6.7
Expand Down
2 changes: 1 addition & 1 deletion setup_requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
]

extras_require = {
':python_version < "3"': ['chainmap', 'singledispatch >= 3.4.0.3'],
':python_version < "3"': ['singledispatch >= 3.4.0.3'],
# Requirements for ssh transport with authentification through Kerberos token
# N. B.: you need to install first libffi and MIT kerberos GSSAPI including header files.
# E.g. for Ubuntu 14.04: sudo apt-get install libffi-dev libkrb5-dev
Expand Down

0 comments on commit 300903f

Please sign in to comment.