Cleanup the top-level directory of the repository (#3738)

* Include `bin/runaiida` through `console_scripts` of `setup.json` * Remove the outdated examples from `examples` directory * Remove obsolete `utils/plugin_tpl/calculation.tpl` superseded by plugin cookie cutter package * Move `conftest` to the `tests` directory
aiidateam · Apr 4, 2020 · 5c0d86f · 5c0d86f
1 parent f40f0d2
commit 5c0d86f
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 385 deletions.
diff --git a/.github/workflows/tests.sh b/.github/workflows/tests.sh
@@ -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
diff --git a/bin/runaiida b/bin/runaiida
diff --git a/examples/__init__.py b/examples/__init__.py
diff --git a/examples/work/__init__.py b/examples/work/__init__.py
diff --git a/examples/work/workchain.py b/examples/work/workchain.py
diff --git a/examples/work/workchain_outline.py b/examples/work/workchain_outline.py
diff --git a/examples/work/workfunction.py b/examples/work/workfunction.py
diff --git a/setup.json b/setup.json
@@ -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",
@@ -201,8 +202,5 @@
       "realhydrogen = aiida.tools.data.orbital.realhydrogen:RealhydrogenOrbital"
     ],
     "aiida.workflows": []
-  },
-  "scripts": [
-    "bin/runaiida"
-  ]
+  }
 }
diff --git a/conftest.py → tests/conftest.py b/conftest.py → tests/conftest.py
@@ -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