Move ert docs into subfolder

equinor · Sep 16, 2024 · 1a533fd · 1a533fd
1 parent 7556552
commit 1a533fd
Show file tree

Hide file tree

Showing 122 changed files with 46 additions and 14 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -33,14 +33,15 @@ 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
     with:
       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,20 +76,22 @@ 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
     with:
       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
@@ -40,29 +40,57 @@ 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: |
         # Run this before the 'Test CLI' entry below, which produces a few files that are accepted for now. Exclude the wheel.
         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 → docs/ert/_ext/ert_jobs.py b/docs/_ext/ert_jobs.py → docs/ert/_ext/ert_jobs.py
diff --git a/docs/_templates/breadcrumbs.html → docs/ert/_templates/breadcrumbs.html b/docs/_templates/breadcrumbs.html → docs/ert/_templates/breadcrumbs.html
diff --git a/docs/_templates/ert_narratives.tmpl → docs/ert/_templates/ert_narratives.tmpl b/docs/_templates/ert_narratives.tmpl → docs/ert/_templates/ert_narratives.tmpl
diff --git a/docs/about/click-on-stderr.png → docs/ert/about/click-on-stderr.png b/docs/about/click-on-stderr.png → docs/ert/about/click-on-stderr.png
diff --git a/docs/about/click-show-details.png → docs/ert/about/click-show-details.png b/docs/about/click-show-details.png → docs/ert/about/click-show-details.png
diff --git a/docs/about/index.rst → docs/ert/about/index.rst b/docs/about/index.rst → docs/ert/about/index.rst
diff --git a/docs/about/license-retry.png → docs/ert/about/license-retry.png b/docs/about/license-retry.png → docs/ert/about/license-retry.png
diff --git a/docs/about/release_notes.rst → docs/ert/about/release_notes.rst b/docs/about/release_notes.rst → docs/ert/about/release_notes.rst
diff --git a/docs/about/v10_manage_experiments.png → docs/ert/about/v10_manage_experiments.png b/docs/about/v10_manage_experiments.png → docs/ert/about/v10_manage_experiments.png
diff --git a/docs/about/v9_auto_scale.png → docs/ert/about/v9_auto_scale.png b/docs/about/v9_auto_scale.png → docs/ert/about/v9_auto_scale.png
diff --git a/docs/about/v9_update_param.png → docs/ert/about/v9_update_param.png b/docs/about/v9_update_param.png → docs/ert/about/v9_update_param.png
diff --git a/docs/about/version-8.0-delete-runpath.gif → .../ert/about/version-8.0-delete-runpath.gif b/docs/about/version-8.0-delete-runpath.gif → .../ert/about/version-8.0-delete-runpath.gif
diff --git a/docs/about/version-8.0-localization.gif → docs/ert/about/version-8.0-localization.gif b/docs/about/version-8.0-localization.gif → docs/ert/about/version-8.0-localization.gif
diff --git a/docs/about/version-8.0-suggestor.png → docs/ert/about/version-8.0-suggestor.png b/docs/about/version-8.0-suggestor.png → docs/ert/about/version-8.0-suggestor.png
diff --git a/docs/about/version-8.0-update.gif → docs/ert/about/version-8.0-update.gif b/docs/about/version-8.0-update.gif → docs/ert/about/version-8.0-update.gif
diff --git a/docs/conf.py → docs/ert/conf.py b/docs/conf.py → docs/ert/conf.py
diff --git a/docs/developer_documentation/concepts.rst → .../ert/developer_documentation/concepts.rst b/docs/developer_documentation/concepts.rst → .../ert/developer_documentation/concepts.rst
diff --git a/.../developer_documentation/dev-strategy.rst → .../developer_documentation/dev-strategy.rst b/.../developer_documentation/dev-strategy.rst → .../developer_documentation/dev-strategy.rst
diff --git a/...developer_documentation/forward_model.rst → ...developer_documentation/forward_model.rst b/...developer_documentation/forward_model.rst → ...developer_documentation/forward_model.rst
diff --git a/docs/developer_documentation/qt.rst → docs/ert/developer_documentation/qt.rst b/docs/developer_documentation/qt.rst → docs/ert/developer_documentation/qt.rst
diff --git a/docs/developer_documentation/roadmap.rst → docs/ert/developer_documentation/roadmap.rst b/docs/developer_documentation/roadmap.rst → docs/ert/developer_documentation/roadmap.rst
diff --git a/..._started/configuration/poly_new/guide.rst → ..._started/configuration/poly_new/guide.rst b/..._started/configuration/poly_new/guide.rst → ..._started/configuration/poly_new/guide.rst
diff --git a/.../configuration/poly_new/minimal/POLY_EVAL → .../configuration/poly_new/minimal/POLY_EVAL b/.../configuration/poly_new/minimal/POLY_EVAL → .../configuration/poly_new/minimal/POLY_EVAL
diff --git a/...ed/configuration/poly_new/minimal/ert.png → ...ed/configuration/poly_new/minimal/ert.png b/...ed/configuration/poly_new/minimal/ert.png → ...ed/configuration/poly_new/minimal/ert.png
diff --git a/...d/configuration/poly_new/minimal/poly.ert → ...d/configuration/poly_new/minimal/poly.ert b/...d/configuration/poly_new/minimal/poly.ert → ...d/configuration/poly_new/minimal/poly.ert
diff --git a/...guration/poly_new/minimal/simulations.png → ...guration/poly_new/minimal/simulations.png b/...guration/poly_new/minimal/simulations.png → ...guration/poly_new/minimal/simulations.png
diff --git a/...guration/poly_new/minimal/startdialog.png → ...guration/poly_new/minimal/startdialog.png b/...guration/poly_new/minimal/startdialog.png → ...guration/poly_new/minimal/startdialog.png
diff --git a/...onfiguration/poly_new/minimal/warning.png → ...onfiguration/poly_new/minimal/warning.png b/...onfiguration/poly_new/minimal/warning.png → ...onfiguration/poly_new/minimal/warning.png
diff --git a/...poly_new/with_more_observations/POLY_EVAL → ...poly_new/with_more_observations/POLY_EVAL b/...poly_new/with_more_observations/POLY_EVAL → ...poly_new/with_more_observations/POLY_EVAL
diff --git a/...ly_new/with_more_observations/coeff_b.png → ...ly_new/with_more_observations/coeff_b.png b/...ly_new/with_more_observations/coeff_b.png → ...ly_new/with_more_observations/coeff_b.png
diff --git a/...y_new/with_more_observations/coeff_priors → ...y_new/with_more_observations/coeff_priors b/...y_new/with_more_observations/coeff_priors → ...y_new/with_more_observations/coeff_priors
diff --git a/...ations/generate_synthetic_observations.py → ...ations/generate_synthetic_observations.py b/...ations/generate_synthetic_observations.py → ...ations/generate_synthetic_observations.py
diff --git a/...y_new/with_more_observations/observations → ...y_new/with_more_observations/observations b/...y_new/with_more_observations/observations → ...y_new/with_more_observations/observations
diff --git a/...y_new/with_more_observations/poly_eval.py → ...y_new/with_more_observations/poly_eval.py b/...y_new/with_more_observations/poly_eval.py → ...y_new/with_more_observations/poly_eval.py
diff --git a/...new/with_more_observations/poly_final.ert → ...new/with_more_observations/poly_final.ert b/...new/with_more_observations/poly_final.ert → ...new/with_more_observations/poly_final.ert
diff --git a/.../with_more_observations/poly_obs_data.txt → .../with_more_observations/poly_obs_data.txt b/.../with_more_observations/poly_obs_data.txt → .../with_more_observations/poly_obs_data.txt
diff --git a/...tion/poly_new/with_observations/POLY_EVAL → ...tion/poly_new/with_observations/POLY_EVAL b/...tion/poly_new/with_observations/POLY_EVAL → ...tion/poly_new/with_observations/POLY_EVAL
diff --git a/...on/poly_new/with_observations/coeff_a.png → ...on/poly_new/with_observations/coeff_a.png b/...on/poly_new/with_observations/coeff_a.png → ...on/poly_new/with_observations/coeff_a.png
diff --git a/...on/poly_new/with_observations/coeff_b.png → ...on/poly_new/with_observations/coeff_b.png b/...on/poly_new/with_observations/coeff_b.png → ...on/poly_new/with_observations/coeff_b.png
diff --git a/...on/poly_new/with_observations/coeff_c.png → ...on/poly_new/with_observations/coeff_c.png b/...on/poly_new/with_observations/coeff_c.png → ...on/poly_new/with_observations/coeff_c.png
diff --git a/...n/poly_new/with_observations/coeff_priors → ...n/poly_new/with_observations/coeff_priors b/...n/poly_new/with_observations/coeff_priors → ...n/poly_new/with_observations/coeff_priors
diff --git a/...ations/generate_synthetic_observations.py → ...ations/generate_synthetic_observations.py b/...ations/generate_synthetic_observations.py → ...ations/generate_synthetic_observations.py
diff --git a/...n/poly_new/with_observations/observations → ...n/poly_new/with_observations/observations b/...n/poly_new/with_observations/observations → ...n/poly_new/with_observations/observations
diff --git a/...n/poly_new/with_observations/plot_obs.png → ...n/poly_new/with_observations/plot_obs.png b/...n/poly_new/with_observations/plot_obs.png → ...n/poly_new/with_observations/plot_obs.png
diff --git a/...n/poly_new/with_observations/poly_eval.py → ...n/poly_new/with_observations/poly_eval.py b/...n/poly_new/with_observations/poly_eval.py → ...n/poly_new/with_observations/poly_eval.py
diff --git a/...poly_new/with_observations/poly_final.ert → ...poly_new/with_observations/poly_final.ert b/...poly_new/with_observations/poly_final.ert → ...poly_new/with_observations/poly_final.ert
diff --git a/...y_new/with_observations/poly_obs_data.txt → ...y_new/with_observations/poly_obs_data.txt b/...y_new/with_observations/poly_obs_data.txt → ...y_new/with_observations/poly_obs_data.txt
diff --git a/...iguration/poly_new/with_results/POLY_EVAL → ...iguration/poly_new/with_results/POLY_EVAL b/...iguration/poly_new/with_results/POLY_EVAL → ...iguration/poly_new/with_results/POLY_EVAL
diff --git a/...ration/poly_new/with_results/coeff_priors → ...ration/poly_new/with_results/coeff_priors b/...ration/poly_new/with_results/coeff_priors → ...ration/poly_new/with_results/coeff_priors
diff --git a/...iguration/poly_new/with_results/plots.png → ...iguration/poly_new/with_results/plots.png b/...iguration/poly_new/with_results/plots.png → ...iguration/poly_new/with_results/plots.png
diff --git a/...figuration/poly_new/with_results/poly.ert → ...figuration/poly_new/with_results/poly.ert b/...figuration/poly_new/with_results/poly.ert → ...figuration/poly_new/with_results/poly.ert
diff --git a/...ration/poly_new/with_results/poly_eval.py → ...ration/poly_new/with_results/poly_eval.py b/...ration/poly_new/with_results/poly_eval.py → ...ration/poly_new/with_results/poly_eval.py
diff --git a/...ation/poly_new/with_results/poly_plot.png → ...ation/poly_new/with_results/poly_plot.png b/...ation/poly_new/with_results/poly_plot.png → ...ation/poly_new/with_results/poly_plot.png
diff --git a/...ion/poly_new/with_simple_script/POLY_EVAL → ...ion/poly_new/with_simple_script/POLY_EVAL b/...ion/poly_new/with_simple_script/POLY_EVAL → ...ion/poly_new/with_simple_script/POLY_EVAL
diff --git a/...ation/poly_new/with_simple_script/ert.png → ...ation/poly_new/with_simple_script/ert.png b/...ation/poly_new/with_simple_script/ert.png → ...ation/poly_new/with_simple_script/ert.png
diff --git a/...tion/poly_new/with_simple_script/poly.ert → ...tion/poly_new/with_simple_script/poly.ert b/...tion/poly_new/with_simple_script/poly.ert → ...tion/poly_new/with_simple_script/poly.ert
diff --git a/.../poly_new/with_simple_script/poly_eval.py → .../poly_new/with_simple_script/poly_eval.py b/.../poly_new/with_simple_script/poly_eval.py → .../poly_new/with_simple_script/poly_eval.py
diff --git a/...started/howto/adaptive_localization.ipynb → ...started/howto/adaptive_localization.ipynb b/...started/howto/adaptive_localization.ipynb → ...started/howto/adaptive_localization.ipynb
diff --git a/...ted/howto/ert_screenshot_adaptive_loc.png → ...ted/howto/ert_screenshot_adaptive_loc.png b/...ted/howto/ert_screenshot_adaptive_loc.png → ...ted/howto/ert_screenshot_adaptive_loc.png
diff --git a/docs/getting_started/howto/esmda_restart.rst → ...t/getting_started/howto/esmda_restart.rst b/docs/getting_started/howto/esmda_restart.rst → ...t/getting_started/howto/esmda_restart.rst
diff --git a/docs/getting_started/howto/plugin_system.rst → ...t/getting_started/howto/plugin_system.rst b/docs/getting_started/howto/plugin_system.rst → ...t/getting_started/howto/plugin_system.rst
diff --git a/.../getting_started/howto/restart-es-mda.png → .../getting_started/howto/restart-es-mda.png b/.../getting_started/howto/restart-es-mda.png → .../getting_started/howto/restart-es-mda.png
diff --git a/docs/getting_started/setup.rst → docs/ert/getting_started/setup.rst b/docs/getting_started/setup.rst → docs/ert/getting_started/setup.rst
diff --git a/...ting_parameters/fig/evaluate_ensemble.gif → ...ting_parameters/fig/evaluate_ensemble.gif b/...ting_parameters/fig/evaluate_ensemble.gif → ...ting_parameters/fig/evaluate_ensemble.gif
diff --git a/.../updating_parameters/fig/prior_params.png → .../updating_parameters/fig/prior_params.png b/.../updating_parameters/fig/prior_params.png → .../updating_parameters/fig/prior_params.png
diff --git a/...pdating_parameters/fig/prior_response.png → ...pdating_parameters/fig/prior_response.png b/...pdating_parameters/fig/prior_response.png → ...pdating_parameters/fig/prior_response.png
diff --git a/...pdating_parameters/fig/restart_es_mda.gif → ...pdating_parameters/fig/restart_es_mda.gif b/...pdating_parameters/fig/restart_es_mda.gif → ...pdating_parameters/fig/restart_es_mda.gif
diff --git a/.../updating_parameters/fig/sample_prior.gif → .../updating_parameters/fig/sample_prior.gif b/.../updating_parameters/fig/sample_prior.gif → .../updating_parameters/fig/sample_prior.gif
diff --git a/...updating_parameters/fig/update_report.png → ...updating_parameters/fig/update_report.png b/...updating_parameters/fig/update_report.png → ...updating_parameters/fig/update_report.png
diff --git a/...ing_started/updating_parameters/index.rst → ...ing_started/updating_parameters/index.rst b/...ing_started/updating_parameters/index.rst → ...ing_started/updating_parameters/index.rst
diff --git a/...updating_parameters/update_parameters.rst → ...updating_parameters/update_parameters.rst b/...updating_parameters/update_parameters.rst → ...updating_parameters/update_parameters.rst
diff --git a/...arted/webviz-ert/observation_analyzer.gif → ...arted/webviz-ert/observation_analyzer.gif b/...arted/webviz-ert/observation_analyzer.gif → ...arted/webviz-ert/observation_analyzer.gif
diff --git a/...arted/webviz-ert/parameter_comparison.gif → ...arted/webviz-ert/parameter_comparison.gif b/...arted/webviz-ert/parameter_comparison.gif → ...arted/webviz-ert/parameter_comparison.gif
diff --git a/...etting_started/webviz-ert/plot_viewer.gif → ...etting_started/webviz-ert/plot_viewer.gif b/...etting_started/webviz-ert/plot_viewer.gif → ...etting_started/webviz-ert/plot_viewer.gif
diff --git a/...arted/webviz-ert/response_correlation.gif → ...arted/webviz-ert/response_correlation.gif b/...arted/webviz-ert/response_correlation.gif → ...arted/webviz-ert/response_correlation.gif
diff --git a/docs/getting_started/webviz-ert/start_up.gif → ...t/getting_started/webviz-ert/start_up.gif b/docs/getting_started/webviz-ert/start_up.gif → ...t/getting_started/webviz-ert/start_up.gif
diff --git a/...getting_started/webviz-ert/webviz-ert.rst → ...getting_started/webviz-ert/webviz-ert.rst b/...getting_started/webviz-ert/webviz-ert.rst → ...getting_started/webviz-ert/webviz-ert.rst
diff --git a/docs/img/logo.png → docs/ert/img/logo.png b/docs/img/logo.png → docs/ert/img/logo.png
diff --git a/docs/index.rst → docs/ert/index.rst b/docs/index.rst → docs/ert/index.rst
diff --git a/docs/reference/configuration/data_types.rst → ...rt/reference/configuration/data_types.rst b/docs/reference/configuration/data_types.rst → ...rt/reference/configuration/data_types.rst
diff --git a/docs/reference/configuration/fig/README.md → ...ert/reference/configuration/fig/README.md b/docs/reference/configuration/fig/README.md → ...ert/reference/configuration/fig/README.md
diff --git a/docs/reference/configuration/fig/config.ert → ...rt/reference/configuration/fig/config.ert b/docs/reference/configuration/fig/config.ert → ...rt/reference/configuration/fig/config.ert
diff --git a/docs/reference/configuration/fig/const.png → ...ert/reference/configuration/fig/const.png b/docs/reference/configuration/fig/const.png → ...ert/reference/configuration/fig/const.png
diff --git a/.../configuration/fig/derrf_right_skewed.png → .../configuration/fig/derrf_right_skewed.png b/.../configuration/fig/derrf_right_skewed.png → .../configuration/fig/derrf_right_skewed.png
diff --git a/...iguration/fig/derrf_symmetric_uniform.png → ...iguration/fig/derrf_symmetric_uniform.png b/...iguration/fig/derrf_symmetric_uniform.png → ...iguration/fig/derrf_symmetric_uniform.png
diff --git a/docs/reference/configuration/fig/dunif.png → ...ert/reference/configuration/fig/dunif.png b/docs/reference/configuration/fig/dunif.png → ...ert/reference/configuration/fig/dunif.png
diff --git a/...ration/fig/errf_right_skewed_unimodal.png → ...ration/fig/errf_right_skewed_unimodal.png b/...ration/fig/errf_right_skewed_unimodal.png → ...ration/fig/errf_right_skewed_unimodal.png
diff --git a/...figuration/fig/errf_symmetric_uniform.png → ...figuration/fig/errf_symmetric_uniform.png b/...figuration/fig/errf_symmetric_uniform.png → ...figuration/fig/errf_symmetric_uniform.png
diff --git a/...reference/configuration/fig/lognormal.png → ...reference/configuration/fig/lognormal.png b/...reference/configuration/fig/lognormal.png → ...reference/configuration/fig/lognormal.png
diff --git a/...eference/configuration/fig/loguniform.png → ...eference/configuration/fig/loguniform.png b/...eference/configuration/fig/loguniform.png → ...eference/configuration/fig/loguniform.png
diff --git a/docs/reference/configuration/fig/normal.png → ...rt/reference/configuration/fig/normal.png b/docs/reference/configuration/fig/normal.png → ...rt/reference/configuration/fig/normal.png
diff --git a/docs/reference/configuration/fig/priors.txt → ...rt/reference/configuration/fig/priors.txt b/docs/reference/configuration/fig/priors.txt → ...rt/reference/configuration/fig/priors.txt
diff --git a/...eference/configuration/fig/triangular.png → ...eference/configuration/fig/triangular.png b/...eference/configuration/fig/triangular.png → ...eference/configuration/fig/triangular.png
diff --git a/...erence/configuration/fig/truncated_ok.png → ...erence/configuration/fig/truncated_ok.png b/...erence/configuration/fig/truncated_ok.png → ...erence/configuration/fig/truncated_ok.png
diff --git a/docs/reference/configuration/fig/uniform.png → ...t/reference/configuration/fig/uniform.png b/docs/reference/configuration/fig/uniform.png → ...t/reference/configuration/fig/uniform.png
diff --git a/...reference/configuration/forward_model.rst → ...reference/configuration/forward_model.rst b/...reference/configuration/forward_model.rst → ...reference/configuration/forward_model.rst
diff --git a/docs/reference/configuration/index.rst → docs/ert/reference/configuration/index.rst b/docs/reference/configuration/index.rst → docs/ert/reference/configuration/index.rst
diff --git a/docs/reference/configuration/keywords.rst → .../ert/reference/configuration/keywords.rst b/docs/reference/configuration/keywords.rst → .../ert/reference/configuration/keywords.rst
diff --git a/...reference/configuration/magic_strings.rst → ...reference/configuration/magic_strings.rst b/...reference/configuration/magic_strings.rst → ...reference/configuration/magic_strings.rst
diff --git a/.../reference/configuration/observations.rst → .../reference/configuration/observations.rst b/.../reference/configuration/observations.rst → .../reference/configuration/observations.rst
diff --git a/docs/reference/configuration/queue.rst → docs/ert/reference/configuration/queue.rst b/docs/reference/configuration/queue.rst → docs/ert/reference/configuration/queue.rst
diff --git a/docs/reference/configuration/site_wide.rst → ...ert/reference/configuration/site_wide.rst b/docs/reference/configuration/site_wide.rst → ...ert/reference/configuration/site_wide.rst
diff --git a/docs/reference/queue/QUEUE_TEST → docs/ert/reference/queue/QUEUE_TEST b/docs/reference/queue/QUEUE_TEST → docs/ert/reference/queue/QUEUE_TEST
diff --git a/docs/reference/queue/local_queue.ert → docs/ert/reference/queue/local_queue.ert b/docs/reference/queue/local_queue.ert → docs/ert/reference/queue/local_queue.ert
diff --git a/docs/reference/queue/lsf_queue.ert → docs/ert/reference/queue/lsf_queue.ert b/docs/reference/queue/lsf_queue.ert → docs/ert/reference/queue/lsf_queue.ert
diff --git a/...ference/queue/queue_test_forward_model.py → ...ference/queue/queue_test_forward_model.py b/...ference/queue/queue_test_forward_model.py → ...ference/queue/queue_test_forward_model.py
diff --git a/docs/reference/running_ert.rst → docs/ert/reference/running_ert.rst b/docs/reference/running_ert.rst → docs/ert/reference/running_ert.rst
diff --git a/...ference/workflows/added_workflow_jobs.rst → ...ference/workflows/added_workflow_jobs.rst b/...ference/workflows/added_workflow_jobs.rst → ...ference/workflows/added_workflow_jobs.rst
diff --git a/...eference/workflows/complete_workflows.rst → ...eference/workflows/complete_workflows.rst b/...eference/workflows/complete_workflows.rst → ...eference/workflows/complete_workflows.rst
diff --git a/.../reference/workflows/configuring_jobs.rst → .../reference/workflows/configuring_jobs.rst b/.../reference/workflows/configuring_jobs.rst → .../reference/workflows/configuring_jobs.rst
diff --git a/docs/reference/workflows/index.rst → docs/ert/reference/workflows/index.rst b/docs/reference/workflows/index.rst → docs/ert/reference/workflows/index.rst
diff --git a/docs/reference/workflows/workflows.rst → docs/ert/reference/workflows/workflows.rst b/docs/reference/workflows/workflows.rst → docs/ert/reference/workflows/workflows.rst
diff --git a/docs/static_html/Oscillator.html → docs/ert/static_html/Oscillator.html b/docs/static_html/Oscillator.html → docs/ert/static_html/Oscillator.html
diff --git a/docs/static_html/Polynomial.html → docs/ert/static_html/Polynomial.html b/docs/static_html/Polynomial.html → docs/ert/static_html/Polynomial.html
diff --git a/docs/static_html/README.txt → docs/ert/static_html/README.txt b/docs/static_html/README.txt → docs/ert/static_html/README.txt
diff --git a/docs/static_html/css/narratives.css → docs/ert/static_html/css/narratives.css b/docs/static_html/css/narratives.css → docs/ert/static_html/css/narratives.css
diff --git a/docs/theory/ensemble_based_methods.rst → docs/ert/theory/ensemble_based_methods.rst b/docs/theory/ensemble_based_methods.rst → docs/ert/theory/ensemble_based_methods.rst
diff --git a/docs/theory/images/Bayes_theorem.PNG → docs/ert/theory/images/Bayes_theorem.PNG b/docs/theory/images/Bayes_theorem.PNG → docs/ert/theory/images/Bayes_theorem.PNG
diff --git a/docs/theory/images/bpr.jpg → docs/ert/theory/images/bpr.jpg b/docs/theory/images/bpr.jpg → docs/ert/theory/images/bpr.jpg
diff --git a/docs/theory/images/posterior_path.png → docs/ert/theory/images/posterior_path.png b/docs/theory/images/posterior_path.png → docs/ert/theory/images/posterior_path.png