diff --git a/src/regolith/builders/basebuilder.py b/src/regolith/builders/basebuilder.py index 9ce2e0ebe..8cd8d7fd6 100644 --- a/src/regolith/builders/basebuilder.py +++ b/src/regolith/builders/basebuilder.py @@ -5,7 +5,7 @@ from itertools import groupby from jinja2 import Environment, FileSystemLoader -from xonsh.lib import subprocess +from xonsh.api import subprocess try: from bibtexparser.bibdatabase import BibDatabase diff --git a/src/regolith/database.xsh b/src/regolith/database.xsh index 2f00a4fc1..772ae682d 100644 --- a/src/regolith/database.xsh +++ b/src/regolith/database.xsh @@ -3,8 +3,8 @@ import os from contextlib import contextmanager from warnings import warn -from xonsh.lib import subprocess -from xonsh.lib.os import indir +from xonsh.api import subprocess +from xonsh.api.os import indir try: import hglib diff --git a/src/regolith/deploy.py b/src/regolith/deploy.py index 226731432..8cb196238 100644 --- a/src/regolith/deploy.py +++ b/src/regolith/deploy.py @@ -5,7 +5,7 @@ from distutils.dir_util import copy_tree from warnings import warn -from xonsh.lib import subprocess +from xonsh.api import subprocess try: import hglib diff --git a/src/regolith/helpers/basehelper.py b/src/regolith/helpers/basehelper.py index 6f60e3545..18b8e5f09 100644 --- a/src/regolith/helpers/basehelper.py +++ b/src/regolith/helpers/basehelper.py @@ -5,7 +5,7 @@ from itertools import groupby from jinja2 import Environment, FileSystemLoader -from xonsh.lib import subprocess +from xonsh.api import subprocess from regolith.sorters import category_val, date_key, doc_date_key, level_val from regolith.tools import LATEX_OPTS, date_to_rfc822, gets, latex_safe, latex_safe_url, month_and_year, rfc822now diff --git a/src/regolith/storage.py b/src/regolith/storage.py index 780b0cac5..22686f5e1 100644 --- a/src/regolith/storage.py +++ b/src/regolith/storage.py @@ -5,7 +5,7 @@ from contextlib import contextmanager from warnings import warn -from xonsh.lib import subprocess +from xonsh.api import subprocess try: import hglib diff --git a/src/regolith/tests/bootstrap_builders.py b/src/regolith/tests/bootstrap_builders.py index ec1e749c1..20b797b54 100644 --- a/src/regolith/tests/bootstrap_builders.py +++ b/src/regolith/tests/bootstrap_builders.py @@ -5,7 +5,7 @@ import tempfile from copy import deepcopy -from xonsh.lib import subprocess +from xonsh.api import subprocess from regolith.broker import load_db from regolith.fsclient import dump_yaml diff --git a/src/regolith/tests/conftest.py b/src/regolith/tests/conftest.py index 512ff4ac9..7d85d6521 100644 --- a/src/regolith/tests/conftest.py +++ b/src/regolith/tests/conftest.py @@ -10,8 +10,8 @@ import pytest from pymongo import MongoClient from pymongo import errors as mongo_errors -from xonsh.lib import subprocess -from xonsh.lib.os import rmtree +from xonsh.api import subprocess +from xonsh.api.os import rmtree from regolith.fsclient import dump_yaml from regolith.schemas import EXEMPLARS diff --git a/src/regolith/tests/test_validate.py b/src/regolith/tests/test_validate.py index 1e1dc24b0..4020a2e0c 100644 --- a/src/regolith/tests/test_validate.py +++ b/src/regolith/tests/test_validate.py @@ -4,7 +4,7 @@ from subprocess import CalledProcessError import pytest -from xonsh.lib import subprocess +from xonsh.api import subprocess from regolith.main import main