diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index 9f3d3145c80..8a5c133857b 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -33,7 +33,7 @@ jobs: strategy: fail-fast: false matrix: - test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ] + test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ] python-version: [ '3.8', '3.11', '3.12' ] os: [ ubuntu-latest ] uses: ./.github/workflows/test_ert.yml @@ -41,6 +41,7 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test-type: ${{ matrix.test-type }} + secrets: inherit test-slurm: strategy: @@ -52,13 +53,14 @@ jobs: with: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} + secrets: inherit test-mac-for-tags: if: github.ref_type == 'tag' # only test all variants for tags strategy: fail-fast: false matrix: - test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ] + test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ] python-version: [ '3.8', '3.12' ] os: [ 'macos-13', 'macos-14', 'macos-14-large'] exclude: @@ -74,13 +76,14 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test-type: ${{ matrix.test-type }} + secrets: inherit test-mac: if: github.ref_type != 'tag' # one combination when not tag strategy: fail-fast: false matrix: - test-type: [ 'integration-tests', 'unit-tests', 'gui-test' ] + test-type: [ 'performance-tests', 'unit-tests', 'gui-tests', 'cli-tests' ] python-version: [ '3.12' ] os: [ 'macos-latest' ] uses: ./.github/workflows/test_ert.yml @@ -88,6 +91,7 @@ jobs: os: ${{ matrix.os }} python-version: ${{ matrix.python-version }} test-type: ${{ matrix.test-type }} + secrets: inherit docs-ert: name: Test ert docs @@ -121,7 +125,7 @@ jobs: - name: Install ert run: | - uv pip install ".[dev]" + uv pip install ".[dev, everest]" - name: Make test directory run: | @@ -132,7 +136,7 @@ jobs: - name: Test docs run: | - sphinx-build -n -v -E -W ./docs/ert ./tmp/ert_docs + sphinx-build -n -v -E -W ./docs ./tmp/ert_docs publish: name: Publish to PyPI @@ -156,4 +160,4 @@ jobs: find artifacts -name "*.whl" -exec mv '{}' dist/ \; - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@v1.8.11 + uses: pypa/gh-action-pypi-publish@v1.10.1 diff --git a/.github/workflows/test_ert.yml b/.github/workflows/test_ert.yml index f73004bcdea..ba5392d599f 100644 --- a/.github/workflows/test_ert.yml +++ b/.github/workflows/test_ert.yml @@ -40,22 +40,28 @@ jobs: - name: Install ert run: | - uv pip install ".[dev]" + uv pip install ".[dev, everest]" - - name: Test GUI - if: inputs.test-type == 'gui-test' + - name: GUI Test + if: inputs.test-type == 'gui-tests' run: | - pytest tests --junit-xml=junit.xml -v --mpl -m "requires_window_manager" --benchmark-disable --ignore=tests/everest + pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -v --mpl --benchmark-disable tests/ui_tests/gui + + - name: CLI Test + if: inputs.test-type == 'cli-tests' + run: | + pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -n logical -v --benchmark-disable --dist loadgroup tests/ui_tests/cli - name: Unit Test if: inputs.test-type == 'unit-tests' run: | - pytest tests --junit-xml=junit.xml -n logical --show-capture=stderr -v -m "not integration_test and not requires_window_manager" --benchmark-disable --dist loadgroup --ignore=tests/everest + pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -n logical --show-capture=stderr -v --benchmark-disable --dist loadgroup tests/unit_tests + pytest --doctest-modules --cov=ert --cov-report=xml:cov2.xml src/ --ignore src/ert/dark_storage - - name: Integration Test - if: inputs.test-type == 'integration-tests' + - name: Performance Test + if: inputs.test-type == 'performance-tests' run: | - pytest tests --junit-xml=junit.xml -n logical --show-capture=stderr -v -m "integration_test and not requires_window_manager" --benchmark-disable --ignore=tests/everest + pytest --cov=ert --cov-report=xml:cov1.xml --junit-xml=junit.xml -n logical --show-capture=stderr -v --benchmark-disable --dist loadgroup tests/performance_tests - name: Test for a clean repository run: | @@ -63,6 +69,28 @@ jobs: git status --porcelain | sed '/ert.*.whl$\|\/block_storage$/d' test -z "$(git status --porcelain | sed '/ert.*.whl$\\|\\/block_storage$/d')" + - name: Upload coverage to Codecov + id: codecov1 + uses: codecov/codecov-action@v4 + continue-on-error: true + with: + token: ${{ secrets.CODECOV_TOKEN }} + fail_ci_if_error: true + files: cov1.xml,cov2.xml + flags: ${{ inputs.test-type }} + - name: codecov retry sleep + if: steps.codecov1.outcome == 'failure' + run: | + sleep 30 + - name: Codecov retry + uses: codecov/codecov-action@v4 + if: steps.codecov1.outcome == 'failure' + with: + token: ${{ secrets.CODECOV_TOKEN }} + files: cov1.xml,cov2.xml + flags: ${{ inputs.test-type }} + fail_ci_if_error: ${{ github.ref == 'refs/heads/main' }} + - uses: test-summary/action@v2 continue-on-error: true with: diff --git a/docs/_ext/ert_jobs.py b/docs/ert/_ext/ert_jobs.py similarity index 100% rename from docs/_ext/ert_jobs.py rename to docs/ert/_ext/ert_jobs.py diff --git a/docs/_templates/breadcrumbs.html b/docs/ert/_templates/breadcrumbs.html similarity index 100% rename from docs/_templates/breadcrumbs.html rename to docs/ert/_templates/breadcrumbs.html diff --git a/docs/_templates/ert_narratives.tmpl b/docs/ert/_templates/ert_narratives.tmpl similarity index 100% rename from docs/_templates/ert_narratives.tmpl rename to docs/ert/_templates/ert_narratives.tmpl diff --git a/docs/about/click-on-stderr.png b/docs/ert/about/click-on-stderr.png similarity index 100% rename from docs/about/click-on-stderr.png rename to docs/ert/about/click-on-stderr.png diff --git a/docs/about/click-show-details.png b/docs/ert/about/click-show-details.png similarity index 100% rename from docs/about/click-show-details.png rename to docs/ert/about/click-show-details.png diff --git a/docs/about/index.rst b/docs/ert/about/index.rst similarity index 100% rename from docs/about/index.rst rename to docs/ert/about/index.rst diff --git a/docs/about/license-retry.png b/docs/ert/about/license-retry.png similarity index 100% rename from docs/about/license-retry.png rename to docs/ert/about/license-retry.png diff --git a/docs/about/release_notes.rst b/docs/ert/about/release_notes.rst similarity index 100% rename from docs/about/release_notes.rst rename to docs/ert/about/release_notes.rst diff --git a/docs/about/v10_manage_experiments.png b/docs/ert/about/v10_manage_experiments.png similarity index 100% rename from docs/about/v10_manage_experiments.png rename to docs/ert/about/v10_manage_experiments.png diff --git a/docs/about/v9_auto_scale.png b/docs/ert/about/v9_auto_scale.png similarity index 100% rename from docs/about/v9_auto_scale.png rename to docs/ert/about/v9_auto_scale.png diff --git a/docs/about/v9_update_param.png b/docs/ert/about/v9_update_param.png similarity index 100% rename from docs/about/v9_update_param.png rename to docs/ert/about/v9_update_param.png diff --git a/docs/about/version-8.0-delete-runpath.gif b/docs/ert/about/version-8.0-delete-runpath.gif similarity index 100% rename from docs/about/version-8.0-delete-runpath.gif rename to docs/ert/about/version-8.0-delete-runpath.gif diff --git a/docs/about/version-8.0-localization.gif b/docs/ert/about/version-8.0-localization.gif similarity index 100% rename from docs/about/version-8.0-localization.gif rename to docs/ert/about/version-8.0-localization.gif diff --git a/docs/about/version-8.0-suggestor.png b/docs/ert/about/version-8.0-suggestor.png similarity index 100% rename from docs/about/version-8.0-suggestor.png rename to docs/ert/about/version-8.0-suggestor.png diff --git a/docs/about/version-8.0-update.gif b/docs/ert/about/version-8.0-update.gif similarity index 100% rename from docs/about/version-8.0-update.gif rename to docs/ert/about/version-8.0-update.gif diff --git a/docs/conf.py b/docs/ert/conf.py similarity index 100% rename from docs/conf.py rename to docs/ert/conf.py diff --git a/docs/developer_documentation/concepts.rst b/docs/ert/developer_documentation/concepts.rst similarity index 100% rename from docs/developer_documentation/concepts.rst rename to docs/ert/developer_documentation/concepts.rst diff --git a/docs/developer_documentation/dev-strategy.rst b/docs/ert/developer_documentation/dev-strategy.rst similarity index 100% rename from docs/developer_documentation/dev-strategy.rst rename to docs/ert/developer_documentation/dev-strategy.rst diff --git a/docs/developer_documentation/forward_model.rst b/docs/ert/developer_documentation/forward_model.rst similarity index 100% rename from docs/developer_documentation/forward_model.rst rename to docs/ert/developer_documentation/forward_model.rst diff --git a/docs/developer_documentation/qt.rst b/docs/ert/developer_documentation/qt.rst similarity index 100% rename from docs/developer_documentation/qt.rst rename to docs/ert/developer_documentation/qt.rst diff --git a/docs/developer_documentation/roadmap.rst b/docs/ert/developer_documentation/roadmap.rst similarity index 100% rename from docs/developer_documentation/roadmap.rst rename to docs/ert/developer_documentation/roadmap.rst diff --git a/docs/getting_started/configuration/poly_new/guide.rst b/docs/ert/getting_started/configuration/poly_new/guide.rst similarity index 100% rename from docs/getting_started/configuration/poly_new/guide.rst rename to docs/ert/getting_started/configuration/poly_new/guide.rst diff --git a/docs/getting_started/configuration/poly_new/minimal/POLY_EVAL b/docs/ert/getting_started/configuration/poly_new/minimal/POLY_EVAL similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/POLY_EVAL rename to docs/ert/getting_started/configuration/poly_new/minimal/POLY_EVAL diff --git a/docs/getting_started/configuration/poly_new/minimal/ert.png b/docs/ert/getting_started/configuration/poly_new/minimal/ert.png similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/ert.png rename to docs/ert/getting_started/configuration/poly_new/minimal/ert.png diff --git a/docs/getting_started/configuration/poly_new/minimal/poly.ert b/docs/ert/getting_started/configuration/poly_new/minimal/poly.ert similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/poly.ert rename to docs/ert/getting_started/configuration/poly_new/minimal/poly.ert diff --git a/docs/getting_started/configuration/poly_new/minimal/simulations.png b/docs/ert/getting_started/configuration/poly_new/minimal/simulations.png similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/simulations.png rename to docs/ert/getting_started/configuration/poly_new/minimal/simulations.png diff --git a/docs/getting_started/configuration/poly_new/minimal/startdialog.png b/docs/ert/getting_started/configuration/poly_new/minimal/startdialog.png similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/startdialog.png rename to docs/ert/getting_started/configuration/poly_new/minimal/startdialog.png diff --git a/docs/getting_started/configuration/poly_new/minimal/warning.png b/docs/ert/getting_started/configuration/poly_new/minimal/warning.png similarity index 100% rename from docs/getting_started/configuration/poly_new/minimal/warning.png rename to docs/ert/getting_started/configuration/poly_new/minimal/warning.png diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/POLY_EVAL b/docs/ert/getting_started/configuration/poly_new/with_more_observations/POLY_EVAL similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/POLY_EVAL rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/POLY_EVAL diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/coeff_b.png b/docs/ert/getting_started/configuration/poly_new/with_more_observations/coeff_b.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/coeff_b.png rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/coeff_b.png diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/coeff_priors b/docs/ert/getting_started/configuration/poly_new/with_more_observations/coeff_priors similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/coeff_priors rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/coeff_priors diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/generate_synthetic_observations.py b/docs/ert/getting_started/configuration/poly_new/with_more_observations/generate_synthetic_observations.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/generate_synthetic_observations.py rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/generate_synthetic_observations.py diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/observations b/docs/ert/getting_started/configuration/poly_new/with_more_observations/observations similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/observations rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/observations diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/poly_eval.py b/docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_eval.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/poly_eval.py rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_eval.py diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/poly_final.ert b/docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_final.ert similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/poly_final.ert rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_final.ert diff --git a/docs/getting_started/configuration/poly_new/with_more_observations/poly_obs_data.txt b/docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_obs_data.txt similarity index 100% rename from docs/getting_started/configuration/poly_new/with_more_observations/poly_obs_data.txt rename to docs/ert/getting_started/configuration/poly_new/with_more_observations/poly_obs_data.txt diff --git a/docs/getting_started/configuration/poly_new/with_observations/POLY_EVAL b/docs/ert/getting_started/configuration/poly_new/with_observations/POLY_EVAL similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/POLY_EVAL rename to docs/ert/getting_started/configuration/poly_new/with_observations/POLY_EVAL diff --git a/docs/getting_started/configuration/poly_new/with_observations/coeff_a.png b/docs/ert/getting_started/configuration/poly_new/with_observations/coeff_a.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/coeff_a.png rename to docs/ert/getting_started/configuration/poly_new/with_observations/coeff_a.png diff --git a/docs/getting_started/configuration/poly_new/with_observations/coeff_b.png b/docs/ert/getting_started/configuration/poly_new/with_observations/coeff_b.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/coeff_b.png rename to docs/ert/getting_started/configuration/poly_new/with_observations/coeff_b.png diff --git a/docs/getting_started/configuration/poly_new/with_observations/coeff_c.png b/docs/ert/getting_started/configuration/poly_new/with_observations/coeff_c.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/coeff_c.png rename to docs/ert/getting_started/configuration/poly_new/with_observations/coeff_c.png diff --git a/docs/getting_started/configuration/poly_new/with_observations/coeff_priors b/docs/ert/getting_started/configuration/poly_new/with_observations/coeff_priors similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/coeff_priors rename to docs/ert/getting_started/configuration/poly_new/with_observations/coeff_priors diff --git a/docs/getting_started/configuration/poly_new/with_observations/generate_synthetic_observations.py b/docs/ert/getting_started/configuration/poly_new/with_observations/generate_synthetic_observations.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/generate_synthetic_observations.py rename to docs/ert/getting_started/configuration/poly_new/with_observations/generate_synthetic_observations.py diff --git a/docs/getting_started/configuration/poly_new/with_observations/observations b/docs/ert/getting_started/configuration/poly_new/with_observations/observations similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/observations rename to docs/ert/getting_started/configuration/poly_new/with_observations/observations diff --git a/docs/getting_started/configuration/poly_new/with_observations/plot_obs.png b/docs/ert/getting_started/configuration/poly_new/with_observations/plot_obs.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/plot_obs.png rename to docs/ert/getting_started/configuration/poly_new/with_observations/plot_obs.png diff --git a/docs/getting_started/configuration/poly_new/with_observations/poly_eval.py b/docs/ert/getting_started/configuration/poly_new/with_observations/poly_eval.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/poly_eval.py rename to docs/ert/getting_started/configuration/poly_new/with_observations/poly_eval.py diff --git a/docs/getting_started/configuration/poly_new/with_observations/poly_final.ert b/docs/ert/getting_started/configuration/poly_new/with_observations/poly_final.ert similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/poly_final.ert rename to docs/ert/getting_started/configuration/poly_new/with_observations/poly_final.ert diff --git a/docs/getting_started/configuration/poly_new/with_observations/poly_obs_data.txt b/docs/ert/getting_started/configuration/poly_new/with_observations/poly_obs_data.txt similarity index 100% rename from docs/getting_started/configuration/poly_new/with_observations/poly_obs_data.txt rename to docs/ert/getting_started/configuration/poly_new/with_observations/poly_obs_data.txt diff --git a/docs/getting_started/configuration/poly_new/with_results/POLY_EVAL b/docs/ert/getting_started/configuration/poly_new/with_results/POLY_EVAL similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/POLY_EVAL rename to docs/ert/getting_started/configuration/poly_new/with_results/POLY_EVAL diff --git a/docs/getting_started/configuration/poly_new/with_results/coeff_priors b/docs/ert/getting_started/configuration/poly_new/with_results/coeff_priors similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/coeff_priors rename to docs/ert/getting_started/configuration/poly_new/with_results/coeff_priors diff --git a/docs/getting_started/configuration/poly_new/with_results/plots.png b/docs/ert/getting_started/configuration/poly_new/with_results/plots.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/plots.png rename to docs/ert/getting_started/configuration/poly_new/with_results/plots.png diff --git a/docs/getting_started/configuration/poly_new/with_results/poly.ert b/docs/ert/getting_started/configuration/poly_new/with_results/poly.ert similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/poly.ert rename to docs/ert/getting_started/configuration/poly_new/with_results/poly.ert diff --git a/docs/getting_started/configuration/poly_new/with_results/poly_eval.py b/docs/ert/getting_started/configuration/poly_new/with_results/poly_eval.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/poly_eval.py rename to docs/ert/getting_started/configuration/poly_new/with_results/poly_eval.py diff --git a/docs/getting_started/configuration/poly_new/with_results/poly_plot.png b/docs/ert/getting_started/configuration/poly_new/with_results/poly_plot.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_results/poly_plot.png rename to docs/ert/getting_started/configuration/poly_new/with_results/poly_plot.png diff --git a/docs/getting_started/configuration/poly_new/with_simple_script/POLY_EVAL b/docs/ert/getting_started/configuration/poly_new/with_simple_script/POLY_EVAL similarity index 100% rename from docs/getting_started/configuration/poly_new/with_simple_script/POLY_EVAL rename to docs/ert/getting_started/configuration/poly_new/with_simple_script/POLY_EVAL diff --git a/docs/getting_started/configuration/poly_new/with_simple_script/ert.png b/docs/ert/getting_started/configuration/poly_new/with_simple_script/ert.png similarity index 100% rename from docs/getting_started/configuration/poly_new/with_simple_script/ert.png rename to docs/ert/getting_started/configuration/poly_new/with_simple_script/ert.png diff --git a/docs/getting_started/configuration/poly_new/with_simple_script/poly.ert b/docs/ert/getting_started/configuration/poly_new/with_simple_script/poly.ert similarity index 100% rename from docs/getting_started/configuration/poly_new/with_simple_script/poly.ert rename to docs/ert/getting_started/configuration/poly_new/with_simple_script/poly.ert diff --git a/docs/getting_started/configuration/poly_new/with_simple_script/poly_eval.py b/docs/ert/getting_started/configuration/poly_new/with_simple_script/poly_eval.py similarity index 100% rename from docs/getting_started/configuration/poly_new/with_simple_script/poly_eval.py rename to docs/ert/getting_started/configuration/poly_new/with_simple_script/poly_eval.py diff --git a/docs/getting_started/howto/adaptive_localization.ipynb b/docs/ert/getting_started/howto/adaptive_localization.ipynb similarity index 100% rename from docs/getting_started/howto/adaptive_localization.ipynb rename to docs/ert/getting_started/howto/adaptive_localization.ipynb diff --git a/docs/getting_started/howto/ert_screenshot_adaptive_loc.png b/docs/ert/getting_started/howto/ert_screenshot_adaptive_loc.png similarity index 100% rename from docs/getting_started/howto/ert_screenshot_adaptive_loc.png rename to docs/ert/getting_started/howto/ert_screenshot_adaptive_loc.png diff --git a/docs/getting_started/howto/esmda_restart.rst b/docs/ert/getting_started/howto/esmda_restart.rst similarity index 100% rename from docs/getting_started/howto/esmda_restart.rst rename to docs/ert/getting_started/howto/esmda_restart.rst diff --git a/docs/getting_started/howto/plugin_system.rst b/docs/ert/getting_started/howto/plugin_system.rst similarity index 100% rename from docs/getting_started/howto/plugin_system.rst rename to docs/ert/getting_started/howto/plugin_system.rst diff --git a/docs/getting_started/howto/restart-es-mda.png b/docs/ert/getting_started/howto/restart-es-mda.png similarity index 100% rename from docs/getting_started/howto/restart-es-mda.png rename to docs/ert/getting_started/howto/restart-es-mda.png diff --git a/docs/getting_started/setup.rst b/docs/ert/getting_started/setup.rst similarity index 100% rename from docs/getting_started/setup.rst rename to docs/ert/getting_started/setup.rst diff --git a/docs/getting_started/updating_parameters/fig/evaluate_ensemble.gif b/docs/ert/getting_started/updating_parameters/fig/evaluate_ensemble.gif similarity index 100% rename from docs/getting_started/updating_parameters/fig/evaluate_ensemble.gif rename to docs/ert/getting_started/updating_parameters/fig/evaluate_ensemble.gif diff --git a/docs/getting_started/updating_parameters/fig/prior_params.png b/docs/ert/getting_started/updating_parameters/fig/prior_params.png similarity index 100% rename from docs/getting_started/updating_parameters/fig/prior_params.png rename to docs/ert/getting_started/updating_parameters/fig/prior_params.png diff --git a/docs/getting_started/updating_parameters/fig/prior_response.png b/docs/ert/getting_started/updating_parameters/fig/prior_response.png similarity index 100% rename from docs/getting_started/updating_parameters/fig/prior_response.png rename to docs/ert/getting_started/updating_parameters/fig/prior_response.png diff --git a/docs/getting_started/updating_parameters/fig/restart_es_mda.gif b/docs/ert/getting_started/updating_parameters/fig/restart_es_mda.gif similarity index 100% rename from docs/getting_started/updating_parameters/fig/restart_es_mda.gif rename to docs/ert/getting_started/updating_parameters/fig/restart_es_mda.gif diff --git a/docs/getting_started/updating_parameters/fig/sample_prior.gif b/docs/ert/getting_started/updating_parameters/fig/sample_prior.gif similarity index 100% rename from docs/getting_started/updating_parameters/fig/sample_prior.gif rename to docs/ert/getting_started/updating_parameters/fig/sample_prior.gif diff --git a/docs/getting_started/updating_parameters/fig/update_report.png b/docs/ert/getting_started/updating_parameters/fig/update_report.png similarity index 100% rename from docs/getting_started/updating_parameters/fig/update_report.png rename to docs/ert/getting_started/updating_parameters/fig/update_report.png diff --git a/docs/getting_started/updating_parameters/index.rst b/docs/ert/getting_started/updating_parameters/index.rst similarity index 100% rename from docs/getting_started/updating_parameters/index.rst rename to docs/ert/getting_started/updating_parameters/index.rst diff --git a/docs/getting_started/updating_parameters/update_parameters.rst b/docs/ert/getting_started/updating_parameters/update_parameters.rst similarity index 100% rename from docs/getting_started/updating_parameters/update_parameters.rst rename to docs/ert/getting_started/updating_parameters/update_parameters.rst diff --git a/docs/getting_started/webviz-ert/observation_analyzer.gif b/docs/ert/getting_started/webviz-ert/observation_analyzer.gif similarity index 100% rename from docs/getting_started/webviz-ert/observation_analyzer.gif rename to docs/ert/getting_started/webviz-ert/observation_analyzer.gif diff --git a/docs/getting_started/webviz-ert/parameter_comparison.gif b/docs/ert/getting_started/webviz-ert/parameter_comparison.gif similarity index 100% rename from docs/getting_started/webviz-ert/parameter_comparison.gif rename to docs/ert/getting_started/webviz-ert/parameter_comparison.gif diff --git a/docs/getting_started/webviz-ert/plot_viewer.gif b/docs/ert/getting_started/webviz-ert/plot_viewer.gif similarity index 100% rename from docs/getting_started/webviz-ert/plot_viewer.gif rename to docs/ert/getting_started/webviz-ert/plot_viewer.gif diff --git a/docs/getting_started/webviz-ert/response_correlation.gif b/docs/ert/getting_started/webviz-ert/response_correlation.gif similarity index 100% rename from docs/getting_started/webviz-ert/response_correlation.gif rename to docs/ert/getting_started/webviz-ert/response_correlation.gif diff --git a/docs/getting_started/webviz-ert/start_up.gif b/docs/ert/getting_started/webviz-ert/start_up.gif similarity index 100% rename from docs/getting_started/webviz-ert/start_up.gif rename to docs/ert/getting_started/webviz-ert/start_up.gif diff --git a/docs/getting_started/webviz-ert/webviz-ert.rst b/docs/ert/getting_started/webviz-ert/webviz-ert.rst similarity index 100% rename from docs/getting_started/webviz-ert/webviz-ert.rst rename to docs/ert/getting_started/webviz-ert/webviz-ert.rst diff --git a/docs/img/logo.png b/docs/ert/img/logo.png similarity index 100% rename from docs/img/logo.png rename to docs/ert/img/logo.png diff --git a/docs/index.rst b/docs/ert/index.rst similarity index 100% rename from docs/index.rst rename to docs/ert/index.rst diff --git a/docs/reference/configuration/data_types.rst b/docs/ert/reference/configuration/data_types.rst similarity index 100% rename from docs/reference/configuration/data_types.rst rename to docs/ert/reference/configuration/data_types.rst diff --git a/docs/reference/configuration/fig/README.md b/docs/ert/reference/configuration/fig/README.md similarity index 100% rename from docs/reference/configuration/fig/README.md rename to docs/ert/reference/configuration/fig/README.md diff --git a/docs/reference/configuration/fig/config.ert b/docs/ert/reference/configuration/fig/config.ert similarity index 100% rename from docs/reference/configuration/fig/config.ert rename to docs/ert/reference/configuration/fig/config.ert diff --git a/docs/reference/configuration/fig/const.png b/docs/ert/reference/configuration/fig/const.png similarity index 100% rename from docs/reference/configuration/fig/const.png rename to docs/ert/reference/configuration/fig/const.png diff --git a/docs/reference/configuration/fig/derrf_right_skewed.png b/docs/ert/reference/configuration/fig/derrf_right_skewed.png similarity index 100% rename from docs/reference/configuration/fig/derrf_right_skewed.png rename to docs/ert/reference/configuration/fig/derrf_right_skewed.png diff --git a/docs/reference/configuration/fig/derrf_symmetric_uniform.png b/docs/ert/reference/configuration/fig/derrf_symmetric_uniform.png similarity index 100% rename from docs/reference/configuration/fig/derrf_symmetric_uniform.png rename to docs/ert/reference/configuration/fig/derrf_symmetric_uniform.png diff --git a/docs/reference/configuration/fig/dunif.png b/docs/ert/reference/configuration/fig/dunif.png similarity index 100% rename from docs/reference/configuration/fig/dunif.png rename to docs/ert/reference/configuration/fig/dunif.png diff --git a/docs/reference/configuration/fig/errf_right_skewed_unimodal.png b/docs/ert/reference/configuration/fig/errf_right_skewed_unimodal.png similarity index 100% rename from docs/reference/configuration/fig/errf_right_skewed_unimodal.png rename to docs/ert/reference/configuration/fig/errf_right_skewed_unimodal.png diff --git a/docs/reference/configuration/fig/errf_symmetric_uniform.png b/docs/ert/reference/configuration/fig/errf_symmetric_uniform.png similarity index 100% rename from docs/reference/configuration/fig/errf_symmetric_uniform.png rename to docs/ert/reference/configuration/fig/errf_symmetric_uniform.png diff --git a/docs/reference/configuration/fig/lognormal.png b/docs/ert/reference/configuration/fig/lognormal.png similarity index 100% rename from docs/reference/configuration/fig/lognormal.png rename to docs/ert/reference/configuration/fig/lognormal.png diff --git a/docs/reference/configuration/fig/loguniform.png b/docs/ert/reference/configuration/fig/loguniform.png similarity index 100% rename from docs/reference/configuration/fig/loguniform.png rename to docs/ert/reference/configuration/fig/loguniform.png diff --git a/docs/reference/configuration/fig/normal.png b/docs/ert/reference/configuration/fig/normal.png similarity index 100% rename from docs/reference/configuration/fig/normal.png rename to docs/ert/reference/configuration/fig/normal.png diff --git a/docs/reference/configuration/fig/priors.txt b/docs/ert/reference/configuration/fig/priors.txt similarity index 100% rename from docs/reference/configuration/fig/priors.txt rename to docs/ert/reference/configuration/fig/priors.txt diff --git a/docs/reference/configuration/fig/triangular.png b/docs/ert/reference/configuration/fig/triangular.png similarity index 100% rename from docs/reference/configuration/fig/triangular.png rename to docs/ert/reference/configuration/fig/triangular.png diff --git a/docs/reference/configuration/fig/truncated_ok.png b/docs/ert/reference/configuration/fig/truncated_ok.png similarity index 100% rename from docs/reference/configuration/fig/truncated_ok.png rename to docs/ert/reference/configuration/fig/truncated_ok.png diff --git a/docs/reference/configuration/fig/uniform.png b/docs/ert/reference/configuration/fig/uniform.png similarity index 100% rename from docs/reference/configuration/fig/uniform.png rename to docs/ert/reference/configuration/fig/uniform.png diff --git a/docs/reference/configuration/forward_model.rst b/docs/ert/reference/configuration/forward_model.rst similarity index 100% rename from docs/reference/configuration/forward_model.rst rename to docs/ert/reference/configuration/forward_model.rst diff --git a/docs/reference/configuration/index.rst b/docs/ert/reference/configuration/index.rst similarity index 100% rename from docs/reference/configuration/index.rst rename to docs/ert/reference/configuration/index.rst diff --git a/docs/reference/configuration/keywords.rst b/docs/ert/reference/configuration/keywords.rst similarity index 100% rename from docs/reference/configuration/keywords.rst rename to docs/ert/reference/configuration/keywords.rst diff --git a/docs/reference/configuration/magic_strings.rst b/docs/ert/reference/configuration/magic_strings.rst similarity index 100% rename from docs/reference/configuration/magic_strings.rst rename to docs/ert/reference/configuration/magic_strings.rst diff --git a/docs/reference/configuration/observations.rst b/docs/ert/reference/configuration/observations.rst similarity index 100% rename from docs/reference/configuration/observations.rst rename to docs/ert/reference/configuration/observations.rst diff --git a/docs/reference/configuration/queue.rst b/docs/ert/reference/configuration/queue.rst similarity index 100% rename from docs/reference/configuration/queue.rst rename to docs/ert/reference/configuration/queue.rst diff --git a/docs/reference/configuration/site_wide.rst b/docs/ert/reference/configuration/site_wide.rst similarity index 100% rename from docs/reference/configuration/site_wide.rst rename to docs/ert/reference/configuration/site_wide.rst diff --git a/docs/reference/queue/QUEUE_TEST b/docs/ert/reference/queue/QUEUE_TEST similarity index 100% rename from docs/reference/queue/QUEUE_TEST rename to docs/ert/reference/queue/QUEUE_TEST diff --git a/docs/reference/queue/local_queue.ert b/docs/ert/reference/queue/local_queue.ert similarity index 100% rename from docs/reference/queue/local_queue.ert rename to docs/ert/reference/queue/local_queue.ert diff --git a/docs/reference/queue/lsf_queue.ert b/docs/ert/reference/queue/lsf_queue.ert similarity index 100% rename from docs/reference/queue/lsf_queue.ert rename to docs/ert/reference/queue/lsf_queue.ert diff --git a/docs/reference/queue/queue_test_forward_model.py b/docs/ert/reference/queue/queue_test_forward_model.py similarity index 100% rename from docs/reference/queue/queue_test_forward_model.py rename to docs/ert/reference/queue/queue_test_forward_model.py diff --git a/docs/reference/running_ert.rst b/docs/ert/reference/running_ert.rst similarity index 100% rename from docs/reference/running_ert.rst rename to docs/ert/reference/running_ert.rst diff --git a/docs/reference/workflows/added_workflow_jobs.rst b/docs/ert/reference/workflows/added_workflow_jobs.rst similarity index 100% rename from docs/reference/workflows/added_workflow_jobs.rst rename to docs/ert/reference/workflows/added_workflow_jobs.rst diff --git a/docs/reference/workflows/complete_workflows.rst b/docs/ert/reference/workflows/complete_workflows.rst similarity index 100% rename from docs/reference/workflows/complete_workflows.rst rename to docs/ert/reference/workflows/complete_workflows.rst diff --git a/docs/reference/workflows/configuring_jobs.rst b/docs/ert/reference/workflows/configuring_jobs.rst similarity index 100% rename from docs/reference/workflows/configuring_jobs.rst rename to docs/ert/reference/workflows/configuring_jobs.rst diff --git a/docs/reference/workflows/index.rst b/docs/ert/reference/workflows/index.rst similarity index 100% rename from docs/reference/workflows/index.rst rename to docs/ert/reference/workflows/index.rst diff --git a/docs/reference/workflows/workflows.rst b/docs/ert/reference/workflows/workflows.rst similarity index 100% rename from docs/reference/workflows/workflows.rst rename to docs/ert/reference/workflows/workflows.rst diff --git a/docs/static_html/Oscillator.html b/docs/ert/static_html/Oscillator.html similarity index 100% rename from docs/static_html/Oscillator.html rename to docs/ert/static_html/Oscillator.html diff --git a/docs/static_html/Polynomial.html b/docs/ert/static_html/Polynomial.html similarity index 100% rename from docs/static_html/Polynomial.html rename to docs/ert/static_html/Polynomial.html diff --git a/docs/static_html/README.txt b/docs/ert/static_html/README.txt similarity index 100% rename from docs/static_html/README.txt rename to docs/ert/static_html/README.txt diff --git a/docs/static_html/css/narratives.css b/docs/ert/static_html/css/narratives.css similarity index 100% rename from docs/static_html/css/narratives.css rename to docs/ert/static_html/css/narratives.css diff --git a/docs/theory/ensemble_based_methods.rst b/docs/ert/theory/ensemble_based_methods.rst similarity index 100% rename from docs/theory/ensemble_based_methods.rst rename to docs/ert/theory/ensemble_based_methods.rst diff --git a/docs/theory/images/Bayes_theorem.PNG b/docs/ert/theory/images/Bayes_theorem.PNG similarity index 100% rename from docs/theory/images/Bayes_theorem.PNG rename to docs/ert/theory/images/Bayes_theorem.PNG diff --git a/docs/theory/images/bpr.jpg b/docs/ert/theory/images/bpr.jpg similarity index 100% rename from docs/theory/images/bpr.jpg rename to docs/ert/theory/images/bpr.jpg diff --git a/docs/theory/images/posterior_path.png b/docs/ert/theory/images/posterior_path.png similarity index 100% rename from docs/theory/images/posterior_path.png rename to docs/ert/theory/images/posterior_path.png