diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 8bbc7d01f..3578144b2 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,7 +4,9 @@ build: os: "ubuntu-24.04" tools: python: "3.12" - + jobs: + post_checkout: + - git fetch --unshallow || true sphinx: configuration: docs/source/conf.py diff --git a/Dockerfile b/Dockerfile index 583682ef5..1ae615a50 100644 --- a/Dockerfile +++ b/Dockerfile @@ -194,7 +194,7 @@ ENV LIBMESH_INSTALL_DIR=$HOME/LIBMESH # clone and install openmc RUN mkdir -p ${HOME}/OpenMC && cd ${HOME}/OpenMC \ - && git clone --shallow-submodules --recurse-submodules --single-branch -b ${openmc_branch} --depth=1 ${OPENMC_REPO} \ + && git clone --shallow-submodules --recurse-submodules --single-branch -b ${openmc_branch} ${OPENMC_REPO} \ && mkdir build && cd build ; \ if [ ${build_dagmc} = "on" ] && [ ${build_libmesh} = "on" ]; then \ cmake ../openmc \ diff --git a/LICENSE b/LICENSE index 1f9198c1e..8a60b66bf 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2024 Massachusetts Institute of Technology, UChicago Argonne +Copyright (c) 2011-2025 Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/cmake/Modules/GetVersionFromGit.cmake b/cmake/Modules/GetVersionFromGit.cmake index ee6bac827..42b3725f2 100644 --- a/cmake/Modules/GetVersionFromGit.cmake +++ b/cmake/Modules/GetVersionFromGit.cmake @@ -39,6 +39,11 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git" AND GIT_FOUND) OUTPUT_STRIP_TRAILING_WHITESPACE ) + # If no tags are found, instruct user to fetch them + if(VERSION_STRING STREQUAL "") + message(FATAL_ERROR "No git tags found. Run 'git fetch --tags' and try again.") + endif() + # Extract the commit hash execute_process( COMMAND git rev-parse HEAD diff --git a/docs/source/conf.py b/docs/source/conf.py index 618cbe648..8aeff5cdc 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -62,7 +62,7 @@ master_doc = 'index' # General information about the project. project = 'OpenMC' -copyright = '2011-2024, Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors' +copyright = '2011-2025, Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -71,11 +71,8 @@ copyright = '2011-2024, Massachusetts Institute of Technology, UChicago Argonne import openmc -# The short X.Y version. -version = ".".join(openmc.__version__.split('.')[:2]) - # The full version, including alpha/beta/rc tags. -release = openmc.__version__ +version = release = openmc.__version__ # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/license.rst b/docs/source/license.rst index 23315e8fe..0a90a7441 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -4,7 +4,7 @@ License Agreement ================= -Copyright © 2011-2024 Massachusetts Institute of Technology, UChicago Argonne +Copyright © 2011-2025 Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/man/man1/openmc.1 b/man/man1/openmc.1 index d121a8956..7826a759a 100644 --- a/man/man1/openmc.1 +++ b/man/man1/openmc.1 @@ -63,7 +63,7 @@ Indicates the default path to an HDF5 file that contains multi-group cross section libraries if the user has not specified the tag in .I materials.xml\fP. .SH LICENSE -Copyright \(co 2011-2024 Massachusetts Institute of Technology, UChicago +Copyright \(co 2011-2025 Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors. .PP Permission is hereby granted, free of charge, to any person obtaining a copy of