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.

Sign up for GitHub

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

Clean up top level directory of repository #3738

Merged
merged 1 commit into from
Apr 4, 2020
Merged

Clean up top level directory of repository #3738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion .github/workflows/tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@ verdi daemon stop
pytest --noconftest .ci/test_test_manager.py
pytest --noconftest .ci/test_profile_manager.py
python .ci/test_plugin_testcase.py # uses custom unittest test runner
AIIDA_TEST_PROFILE=test_$AIIDA_TEST_BACKEND pytest .ci/pytest

# Until the `.ci/pytest` tests are moved within `tests` we have to run them separately and pass in the path to the
# `conftest.py` explicitly, because otherwise it won't be able to find the fixtures it provides
AIIDA_TEST_PROFILE=test_$AIIDA_TEST_BACKEND pytest tests/conftest.py .ci/pytest

# main aiida-core tests
AIIDA_TEST_PROFILE=test_$AIIDA_TEST_BACKEND pytest tests
14 changes: 0 additions & 14 deletions bin/runaiida
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions examples/__init__.py
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions examples/work/__init__.py
View file
Open in desktop

This file was deleted.

91 changes: 0 additions & 91 deletions examples/work/workchain.py
View file
Open in desktop

This file was deleted.

78 changes: 0 additions & 78 deletions examples/work/workchain_outline.py
View file
Open in desktop

This file was deleted.

51 changes: 0 additions & 51 deletions examples/work/workfunction.py
View file
Open in desktop

This file was deleted.

8 changes: 3 additions & 5 deletions setup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@
"reentry_register": true,
"entry_points": {
"console_scripts": [
"verdi=aiida.cmdline.commands.cmd_verdi:verdi"
"verdi=aiida.cmdline.commands.cmd_verdi:verdi",
"runaiida=aiida.cmdline.commands.cmd_run:run"
],
"aiida.calculations": [
"arithmetic.add = aiida.calculations.plugins.arithmetic.add:ArithmeticAddCalculation",
Expand Down Expand Up @@ -201,8 +202,5 @@
"realhydrogen = aiida.tools.data.orbital.realhydrogen:RealhydrogenOrbital"
],
"aiida.workflows": []
},
"scripts": [
"bin/runaiida"
]
}
}
1 change: 0 additions & 1 deletion conftest.py → tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# For further information please visit http://www.aiida.net #
###########################################################################
"""Configuration file for pytest tests."""

import pytest # pylint: disable=unused-import

pytest_plugins = ['aiida.manage.tests.pytest_fixtures'] # pylint: disable=invalid-name
Loading