Distribute examples as part of ert3

kvashchuka · Mar 18, 2021 · 8811193 · 8811193
1 parent 89a674e
commit 8811193
Show file tree

Hide file tree

Showing 40 changed files with 7 additions and 6 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -0,0 +1,3 @@
+include ert3/examples/*
+include ert_gui/resources/*
+include ert_logging/*
diff --git a/ert3/console/_console.py b/ert3/console/_console.py
@@ -18,7 +18,7 @@
 
 def _build_init_argparser(subparsers):
     init_parser = subparsers.add_parser("init", help="Initialize an ERT3 workspace")
-    pkg_examples_path = pathlib.Path(pkg.resource_filename("ert", "../examples"))
+    pkg_examples_path = pathlib.Path(pkg.resource_filename("ert3", "examples"))
     ert_example_names = []
     for example in pkg_examples_path.iterdir():
         if example.is_dir() and "__" not in example.name:
@@ -103,7 +103,7 @@ def _init(args):
         ert3.workspace.initialize(pathlib.Path.cwd())
     else:
         example_name = args.example
-        pkg_examples_path = pathlib.Path(pkg.resource_filename("ert", "../examples"))
+        pkg_examples_path = pathlib.Path(pkg.resource_filename("ert3", "examples"))
         pkg_example_path = pkg_examples_path / example_name
         wd_example_path = pathlib.Path.cwd() / example_name
         # check that examples folder exist

diff --git a/.../experiments/doe/coefficients_record.json → .../experiments/doe/coefficients_record.json b/.../experiments/doe/coefficients_record.json → .../experiments/doe/coefficients_record.json
diff --git a/...s/polynomial/experiments/doe/ensemble.yml → ...s/polynomial/experiments/doe/ensemble.yml b/...s/polynomial/experiments/doe/ensemble.yml → ...s/polynomial/experiments/doe/ensemble.yml
diff --git a/...polynomial/experiments/doe/experiment.yml → ...polynomial/experiments/doe/experiment.yml b/...polynomial/experiments/doe/experiment.yml → ...polynomial/experiments/doe/experiment.yml
diff --git a/...omial/experiments/evaluation/ensemble.yml → ...omial/experiments/evaluation/ensemble.yml b/...omial/experiments/evaluation/ensemble.yml → ...omial/experiments/evaluation/ensemble.yml
diff --git a/...ial/experiments/evaluation/experiment.yml → ...ial/experiments/evaluation/experiment.yml b/...ial/experiments/evaluation/experiment.yml → ...ial/experiments/evaluation/experiment.yml
diff --git a/...eriments/function_evaluation/ensemble.yml → ...eriments/function_evaluation/ensemble.yml b/...eriments/function_evaluation/ensemble.yml → ...eriments/function_evaluation/ensemble.yml
diff --git a/...iments/function_evaluation/experiment.yml → ...iments/function_evaluation/experiment.yml b/...iments/function_evaluation/experiment.yml → ...iments/function_evaluation/experiment.yml
diff --git a/...mial/experiments/sensitivity/ensemble.yml → ...mial/experiments/sensitivity/ensemble.yml b/...mial/experiments/sensitivity/ensemble.yml → ...mial/experiments/sensitivity/ensemble.yml
diff --git a/...al/experiments/sensitivity/experiment.yml → ...al/experiments/sensitivity/experiment.yml b/...al/experiments/sensitivity/experiment.yml → ...al/experiments/sensitivity/experiment.yml
diff --git a/...periments/uniform_evaluation/ensemble.yml → ...periments/uniform_evaluation/ensemble.yml b/...periments/uniform_evaluation/ensemble.yml → ...periments/uniform_evaluation/ensemble.yml
diff --git a/...riments/uniform_evaluation/experiment.yml → ...riments/uniform_evaluation/experiment.yml b/...riments/uniform_evaluation/experiment.yml → ...riments/uniform_evaluation/experiment.yml
diff --git a/...eriments/uniform_sensitivity/ensemble.yml → ...eriments/uniform_sensitivity/ensemble.yml b/...eriments/uniform_sensitivity/ensemble.yml → ...eriments/uniform_sensitivity/ensemble.yml
diff --git a/...iments/uniform_sensitivity/experiment.yml → ...iments/uniform_sensitivity/experiment.yml b/...iments/uniform_sensitivity/experiment.yml → ...iments/uniform_sensitivity/experiment.yml
diff --git a/examples/__init__.py → ...les/polynomial/function_steps/__init__.py b/examples/__init__.py → ...les/polynomial/function_steps/__init__.py
diff --git a/...es/polynomial/function_steps/functions.py → ...es/polynomial/function_steps/functions.py b/...es/polynomial/function_steps/functions.py → ...es/polynomial/function_steps/functions.py
diff --git a/examples/polynomial/parameters.yml → ert3/examples/polynomial/parameters.yml b/examples/polynomial/parameters.yml → ert3/examples/polynomial/parameters.yml
diff --git a/examples/polynomial/poly.py → ert3/examples/polynomial/poly.py b/examples/polynomial/poly.py → ert3/examples/polynomial/poly.py
diff --git a/examples/polynomial/run_demo → ert3/examples/polynomial/run_demo b/examples/polynomial/run_demo → ert3/examples/polynomial/run_demo
diff --git a/examples/polynomial/stages.yml → ert3/examples/polynomial/stages.yml b/examples/polynomial/stages.yml → ert3/examples/polynomial/stages.yml
diff --git a/examples/spe1/README.md → ert3/examples/spe1/README.md b/examples/spe1/README.md → ert3/examples/spe1/README.md
diff --git a/examples/spe1/bash.py → ert3/examples/spe1/bash.py b/examples/spe1/bash.py → ert3/examples/spe1/bash.py
diff --git a/examples/spe1/experiments/doe/ensemble.yml → ...xamples/spe1/experiments/doe/ensemble.yml b/examples/spe1/experiments/doe/ensemble.yml → ...xamples/spe1/experiments/doe/ensemble.yml
diff --git a/examples/spe1/experiments/doe/experiment.yml → ...mples/spe1/experiments/doe/experiment.yml b/examples/spe1/experiments/doe/experiment.yml → ...mples/spe1/experiments/doe/experiment.yml
diff --git a/...pe1/experiments/doe/field_properties.json → ...pe1/experiments/doe/field_properties.json b/...pe1/experiments/doe/field_properties.json → ...pe1/experiments/doe/field_properties.json
diff --git a/examples/spe1/experiments/doe/wells.json → .../examples/spe1/experiments/doe/wells.json b/examples/spe1/experiments/doe/wells.json → .../examples/spe1/experiments/doe/wells.json
diff --git a/.../spe1/experiments/evaluation/ensemble.yml → .../spe1/experiments/evaluation/ensemble.yml b/.../spe1/experiments/evaluation/ensemble.yml → .../spe1/experiments/evaluation/ensemble.yml
diff --git a/...pe1/experiments/evaluation/experiment.yml → ...pe1/experiments/evaluation/experiment.yml b/...pe1/experiments/evaluation/experiment.yml → ...pe1/experiments/evaluation/experiment.yml
diff --git a/...spe1/experiments/sensitivity/ensemble.yml → ...spe1/experiments/sensitivity/ensemble.yml b/...spe1/experiments/sensitivity/ensemble.yml → ...spe1/experiments/sensitivity/ensemble.yml
diff --git a/...e1/experiments/sensitivity/experiment.yml → ...e1/experiments/sensitivity/experiment.yml b/...e1/experiments/sensitivity/experiment.yml → ...e1/experiments/sensitivity/experiment.yml
diff --git a/examples/spe1/parameters.yml → ert3/examples/spe1/parameters.yml b/examples/spe1/parameters.yml → ert3/examples/spe1/parameters.yml
diff --git a/examples/spe1/render.py → ert3/examples/spe1/render.py b/examples/spe1/render.py → ert3/examples/spe1/render.py
diff --git a/...ples/spe1/resources/SPE1CASE2.DATA.jinja2 → ...ples/spe1/resources/SPE1CASE2.DATA.jinja2 b/...ples/spe1/resources/SPE1CASE2.DATA.jinja2 → ...ples/spe1/resources/SPE1CASE2.DATA.jinja2
diff --git a/examples/spe1/run_demo → ert3/examples/spe1/run_demo b/examples/spe1/run_demo → ert3/examples/spe1/run_demo
diff --git a/examples/spe1/stages.yml → ert3/examples/spe1/stages.yml b/examples/spe1/stages.yml → ert3/examples/spe1/stages.yml
diff --git a/examples/spe1/summary2json.py → ert3/examples/spe1/summary2json.py b/examples/spe1/summary2json.py → ert3/examples/spe1/summary2json.py
diff --git a/examples/polynomial/function_steps/__init__.py b/examples/polynomial/function_steps/__init__.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -0,0 +1,2 @@
+[build-system]
+requires = ["setuptools", "wheel", "setuptools_scm"]
diff --git a/setup.py b/setup.py
@@ -12,9 +12,6 @@ def package_files(directory):
     return paths
 
 
-extra_files = package_files("ert_gui/resources/")
-logging_configuration = package_files("ert_logging/")
-
 setup(
     name="ert",
     author="Equinor ASA",
@@ -25,7 +22,6 @@ def package_files(directory):
         "console_scripts": "ert3=ert3.console:main",
     },
     packages=find_packages(exclude=["tests*"]),
-    package_data={"ert_gui": extra_files, "ert_logging": logging_configuration},
     include_package_data=True,
     license="Open Source",
     long_description=open("README.md").read(),
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[build-system]
		requires = ["setuptools", "wheel", "setuptools_scm"]