Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix xde #178

Merged
merged 6 commits into from
Apr 6, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
1 change: 1 addition & 0 deletions xde/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
docker-compose
docker==6.1.3 # https://stackoverflow.com/questions/77641240/getting-docker-compose-typeerror-kwargs-from-env-got-an-unexpected-keyword-ar
argparse
pyyaml
setuptools
Expand Down
6 changes: 3 additions & 3 deletions xde/tests/tests.xsh
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ if __name__ == '__main__':
check(
'Test install xxh',
$(echo @(xxh) @(h['xxh_auth']) @(server) @(xxh_args) +iff +s @(shell) +hf /xxh/xde/tests/xonsh/test_env.py ),
"{{'XXH_HOME': '{host_home}/.xxh/.xxh/shells/xxh-shell-xonsh/build/../../../..', 'PYTHONPATH': '{host_home}/.xxh/.xxh/shells/xxh-shell-xonsh/build/../../../../.local/lib/python3.8/site-packages'}}".format(host_home=host_home)
"{{'XXH_HOME': '{host_home}/.xxh/.xxh/shells/xxh-shell-xonsh/build/../../../..', 'PYTHONPATH': '{host_home}/.xxh/.xxh/shells/xxh-shell-xonsh/build/../../../../.local/lib/python3.11/site-packages'}}".format(host_home=host_home)
)

# check(
Expand All @@ -223,7 +223,7 @@ if __name__ == '__main__':
check(
'Test python',
$(echo @(xxh) @(h['xxh_auth']) @(server) @(xxh_args) +hf /xxh/xde/tests/xonsh/test_python.xsh ),
"Python 3.8"
"Python 3.1"
)

check(
Expand Down Expand Up @@ -253,7 +253,7 @@ if __name__ == '__main__':
check(
'Test xontrib',
$(echo @(xxh) @(h['xxh_auth']) @(server) @(xxh_args) +iff +hf /xxh/xde/tests/xonsh/test_xontrib.xsh ),
"autojump installed loaded\nschedule installed loaded"
"sh clp autojump"
)

check(
Expand Down
11 changes: 6 additions & 5 deletions xde/tests/xonsh/test_xontrib.xsh
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#!/usr/bin/env xonsh

xpip install xontrib-autojump > /dev/null 2> /dev/null
xpip install xontrib-schedule > /dev/null 2> /dev/null
xpip install xontrib-sh > /dev/null 2> /dev/null
xpip install xontrib-clp > /dev/null 2> /dev/null

xontrib load autojump > /dev/null 2> /dev/null
xontrib load schedule > /dev/null 2> /dev/null
xontrib load sh > /dev/null 2> /dev/null
xontrib load clp > /dev/null 2> /dev/null

xontrib list autojump schedule 2>&1
from xonsh.xontribs import get_xontribs
print(' '.join(n for n,x in get_xontribs().items() if x.is_loaded), end='')
Loading