Skip to content

Commit

Permalink
Merge c2a1062 into d19974d
Browse files Browse the repository at this point in the history
  • Loading branch information
avmarchenko committed Aug 23, 2020
2 parents d19974d + c2a1062 commit 8cd959c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion exa/static.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,3 @@ def resource(name):
for path, _, files in os.walk(staticdir()):
if name in files:
return os.path.abspath(os.path.join(path, name))

4 changes: 2 additions & 2 deletions exa/util/isotopes.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
from pandas import read_json as _rj
from exa import Editor as _E
from exa import DataFrame as _DF
from exa.static import resource as _resource
if not hasattr(_bz2, "open"):
_bz2.open = _bz2.BZ2File

Expand Down Expand Up @@ -165,11 +166,10 @@ def as_df():


# Data order of isotopic (nuclear) properties:
_resource = "../../static/isotopes.json" # HARDCODED
_resource = _resource("isotopes.json")
_columns = ("A", "Z", "af", "afu", "cov_radius", "van_radius", "g", "mass", "massu", "name",
"eneg", "quad", "spin", "symbol", "color")
_this = _sys.modules[__name__] # Reference to this module
_path = _os.path.abspath(_os.path.join(_os.path.abspath(__file__), _resource))
if not hasattr(_this, "H"):
_create()

0 comments on commit 8cd959c

Please sign in to comment.