Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions arc/settings/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@

paths = list()
paths.append(os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(sys.executable))),
'arc_env', 'bin', 'xtb'))
'xtb_env', 'bin', 'xtb'))
paths.append(os.path.join(home, 'anaconda3', 'envs', 'arc_env', 'bin', 'xtb'))
paths.append(os.path.join(home, 'anaconda3', 'envs', 'xtb_env', 'bin', 'xtb'))
paths.append(os.path.join(home, 'miniconda3', 'envs', 'arc_env', 'bin', 'xtb'))
Expand All @@ -349,7 +349,7 @@
break

arc_pypath_1 = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(sys.executable))),
'arc_env', 'bin', 'python')
'xtb_env', 'bin', 'python')
arc_pypath_2 = os.path.join(home, 'anaconda3', 'envs', 'arc_env', 'bin', 'python')
arc_pypath_3 = os.path.join(home, 'miniconda3', 'envs', 'arc_env', 'bin', 'python')
arc_pypath_4 = os.path.join(home, '.conda', 'envs', 'arc_env', 'bin', 'python')
Expand Down
24 changes: 5 additions & 19 deletions arc/utils/wip.py
Original file line number Diff line number Diff line change
@@ -1,26 +1,12 @@
#!/usr/bin/env python
# encoding: utf-8
#
# Decorator to mark a unit test as a "work_in_progress"
# From http://www.natpryce.com/articles/000788.html
# Copyright 2011 Nat Pryce. Posted 2011-05-30
import unittest
from functools import wraps

from nose.plugins.attrib import attr
from nose.plugins.skip import SkipTest


def fail(message):
raise AssertionError(message)


def work_in_progress(f):
@wraps(f)
def run_test(*args, **kwargs):
def wrapper(*args, **kwargs):
try:
f(*args, **kwargs)
except Exception as e:
raise SkipTest("WIP test failed: " + str(e))
fail("test passed but marked as work in progress")

return attr('work_in_progress')(run_test)
raise unittest.SkipTest("WIP test failed: " + str(e))
raise AssertionError("test passed but marked as work in progress")
return wrapper
8 changes: 4 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ channels:
- defaults
- rmg
- conda-forge
- cantera
- anaconda
dependencies:
- cairo
- cairocffi
- rmg::cantera >=2.3.0
- cantera::cantera=2.6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe >=?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That operator is not generally considered good practice, at his worst this scrambles your dependencies without the developer's knowing, at this best it gives you exactly what you want.

- conda-forge::cclib >=1.7.0
- rmg::chemprop
- coolprop
Expand All @@ -25,9 +27,8 @@ dependencies:
- mpmath
- rmg::muq2
- networkx
- nose
- rmg::numdifftools
- numpy >=1.10.0
- numpy==1.20.1
- conda-forge::openbabel >= 3
- pandas
- psutil
Expand Down Expand Up @@ -57,5 +58,4 @@ dependencies:
- mako
- pytables
- anaconda::pytest
- conda-forge::xtb
- conda-forge::pytest-cov