From 58d03398d746ecd29812fb35ab83517dd95daf7b Mon Sep 17 00:00:00 2001 From: Siu Kwan Lam <1929845+sklam@users.noreply.github.com> Date: Fri, 8 Sep 2023 11:36:18 -0500 Subject: [PATCH 1/5] Merge pull request #988 from sklam/fix/iss987 Fix FreeBsd build --- ffi/Makefile.freebsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffi/Makefile.freebsd b/ffi/Makefile.freebsd index 7b869e876..dbaf3a9af 100644 --- a/ffi/Makefile.freebsd +++ b/ffi/Makefile.freebsd @@ -11,7 +11,7 @@ LIBS = $(LLVM_LIBS) INCLUDE = core.h SRC = assembly.cpp bitcode.cpp core.cpp initfini.cpp module.cpp value.cpp \ executionengine.cpp transforms.cpp passmanagers.cpp targets.cpp dylib.cpp \ - linker.cpp object_file.cpp + linker.cpp object_file.cpp orcjit.cpp OUTPUT = libllvmlite.so all: $(OUTPUT) From a59b56ff6ad71355385d80b85b86b52490b9699a Mon Sep 17 00:00:00 2001 From: esc Date: Mon, 18 Sep 2023 10:26:40 +0200 Subject: [PATCH 2/5] update changelog for 0.41.0 FINAL As title --- CHANGE_LOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGE_LOG b/CHANGE_LOG index 1fba6f654..d2c094437 100644 --- a/CHANGE_LOG +++ b/CHANGE_LOG @@ -1,4 +1,4 @@ -v0.41.0 (Aug 11, 2023) +v0.41.0 (Sept 20, 2023) ----------------------- Pull-Requests: @@ -22,6 +22,7 @@ Pull-Requests: * PR `#967 `_: Expose library name in OrcJIT tracker (`apmasell `_) * PR `#968 `_: Update LLVM manual build instructions (`apmasell `_) * PR `#969 `_: update changelog on main for v0.40.1 (`esc `_) +* PR `#988 `_: Fix FreeBsd build (`sklam `_) Authors: From 6046dd670c86c15687fb06c70d2123a15332c4b0 Mon Sep 17 00:00:00 2001 From: esc Date: Tue, 15 Aug 2023 14:54:55 +0200 Subject: [PATCH 3/5] adding RTD conf file V2 as per request As title --- .readthedocs.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .readthedocs.yaml diff --git a/.readthedocs.yaml b/.readthedocs.yaml new file mode 100644 index 000000000..d2dc450e4 --- /dev/null +++ b/.readthedocs.yaml @@ -0,0 +1,19 @@ +# .readthedocs.yaml +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-22.04 + tools: + python: "3.11" + +sphinx: + configuration: docs/source/conf.py + fail_on_warning: true + +python: + install: + - method: pip + path: . From 54aa6765746ac29c4bceefb3e67e4148603d21fa Mon Sep 17 00:00:00 2001 From: esc Date: Mon, 18 Sep 2023 15:30:40 +0200 Subject: [PATCH 4/5] Merge pull request #983 from esc/rtd_conf_v_2 adding RTD conf file V2 as per request --- docs/environment.yml | 8 -------- docs/source/conf.py | 21 ++++++--------------- readthedocs.yml | 5 ----- setup.py | 3 --- 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 docs/environment.yml delete mode 100644 readthedocs.yml diff --git a/docs/environment.yml b/docs/environment.yml deleted file mode 100644 index 2529353f0..000000000 --- a/docs/environment.yml +++ /dev/null @@ -1,8 +0,0 @@ -# Conda environment configuration for readthedocs - -name: rtdenv -dependencies: - - python=3.9 - - sphinx - # https://stackoverflow.com/questions/67542699/readthedocs-sphinx-not-rendering-bullet-list-from-rst-fileA - - docutils==0.16 diff --git a/docs/source/conf.py b/docs/source/conf.py index ae4ea5253..b76f52c9f 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -15,10 +15,9 @@ import sys import os -import shlex from datetime import datetime -on_rtd = os.environ.get('READTHEDOCS') == 'True' +import sphinx_rtd_theme # If extensions (or modules to document with autodoc) are in another directory, # add these directories to sys.path here. If the directory is relative to the @@ -58,9 +57,10 @@ copyright = '2015, Continuum Analytics' author = 'Continuum Analytics' -if on_rtd: +if os.environ.get('READTHEDOCS'): # RTD replaces the last update date. So we need to hack it in here. - copyright += '. Last updated on {}'.format(datetime.utcnow().strftime('%b %d, %Y')) + copyright += '. Last updated on {}'.format( + datetime.utcnow().strftime('%b %d, %Y')) # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the @@ -121,18 +121,9 @@ # The theme to use for HTML and HTML Help pages. See the documentation for # a list of builtin themes. -html_theme = 'default' - -# on_rtd is whether we are on readthedocs.org -on_rtd = os.environ.get('READTHEDOCS', None) == 'True' - -if not on_rtd: - # only import and set the theme if we're building docs locally - # otherwise, readthedocs.org uses their theme by default, so no need to specify it - import sphinx_rtd_theme - html_theme = 'sphinx_rtd_theme' - html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] +html_theme = 'sphinx_rtd_theme' +html_theme_path = [sphinx_rtd_theme.get_html_theme_path()] # Theme options are theme-specific and customize the look and feel of a theme # further. For a list of options available for each theme, see the diff --git a/readthedocs.yml b/readthedocs.yml deleted file mode 100644 index 0798c1333..000000000 --- a/readthedocs.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Configuration file for readthedocs -# See https://read-the-docs.readthedocs.org/en/latest/yaml-config.html - -conda: - file: docs/environment.yml diff --git a/setup.py b/setup.py index 75150ea4b..d327e5ce0 100644 --- a/setup.py +++ b/setup.py @@ -42,9 +42,6 @@ def _guard_py_ver(): _guard_py_ver() -if os.environ.get('READTHEDOCS', None) == 'True': - sys.exit("setup.py disabled on readthedocs: called with %s" - % (sys.argv,)) import versioneer From 218bf2905d85477fb112d9595b8ab413d85307e8 Mon Sep 17 00:00:00 2001 From: esc Date: Tue, 19 Sep 2023 12:19:12 +0200 Subject: [PATCH 5/5] update CHANGE_LOG to include #983 and #985 As title --- CHANGE_LOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGE_LOG b/CHANGE_LOG index d2c094437..b63fea32c 100644 --- a/CHANGE_LOG +++ b/CHANGE_LOG @@ -22,6 +22,8 @@ Pull-Requests: * PR `#967 `_: Expose library name in OrcJIT tracker (`apmasell `_) * PR `#968 `_: Update LLVM manual build instructions (`apmasell `_) * PR `#969 `_: update changelog on main for v0.40.1 (`esc `_) +* PR `#983 `_: adding RTD conf file V2 as per request (`esc `_) +* PR `#985 `_: Update release checklist post 0.41.0rc1 (`esc `_) * PR `#988 `_: Fix FreeBsd build (`sklam `_) Authors: