Skip to content

Commit

Permalink
Merge Everest into ert
Browse files Browse the repository at this point in the history
  • Loading branch information
oyvindeide committed Sep 16, 2024
1 parent eca3fb1 commit b4ada5c
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 9 deletions.
1 change: 1 addition & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ repos:
- id: no-commit-to-branch
- id: check-json
- id: check-yaml
exclude: tests/everest/test_data/valid_config_file/invalid_yaml_config.yml # Invalid yml needed for testing
- id: end-of-file-fixer
- id: trailing-whitespace
exclude: test-data/eclipse/parse/ERROR.PRT # exact format is needed for testing
Expand Down
16 changes: 7 additions & 9 deletions docs/everest/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# add these directories to sys.path here. If the directory is relative to the
# documentation root, use os.path.abspath to make it absolute, like shown here.
#
import pkg_resources
from importlib import metadata

# -- Project information -----------------------------------------------------

Expand All @@ -21,17 +21,15 @@
author = "Equinor & TNO"


def get_version():
# Retrieve the everest installed version.
everest_version = pkg_resources.get_distribution(project).version
print("everest version: {}".format(everest_version))
return everest_version

try:
dist_version = metadata.version("everest")
except metadata.PackageNotFoundError:
dist_version = "0.0.0"

# The short X.Y version
version = get_version()
version = ".".join(dist_version.split(".")[:2])
# The full version, including alpha/beta/rc tags
release = version
release = dist_version


# -- General configuration ---------------------------------------------------
Expand Down
17 changes: 17 additions & 0 deletions src/everest/version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# file generated by setuptools_scm
# don't change, don't track in version control
TYPE_CHECKING = False
if TYPE_CHECKING:
from typing import Tuple, Union

VERSION_TUPLE = Tuple[Union[int, str], ...]
else:
VERSION_TUPLE = object

version: str
__version__: str
__version_tuple__: VERSION_TUPLE
version_tuple: VERSION_TUPLE

__version__ = version = "1.1.1.dev19+gba468db7.d20240909"
__version_tuple__ = version_tuple = (1, 1, 1, "dev19", "gba468db7.d20240909")

0 comments on commit b4ada5c

Please sign in to comment.