From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WHbxOl85cWFacAEAgWs5BA (envelope-from ) for ; Thu, 21 Oct 2021 11:56:47 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id AI+tNl85cWH4HgAAB5/wlQ (envelope-from ) for ; Thu, 21 Oct 2021 09:56:47 +0000 Received: from mail.notmuchmail.org (nmbug.tethera.net [144.217.243.247]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7C970EDC8 for ; Thu, 21 Oct 2021 11:56:47 +0200 (CEST) Received: from nmbug.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 0A94126DBA; Thu, 21 Oct 2021 05:56:43 -0400 (EDT) X-Greylist: delayed 316 seconds by postgrey-1.36 at nmbug; Thu, 21 Oct 2021 05:56:40 EDT Received: from mailproxy01.manitu.net (mailproxy01.manitu.net [217.11.48.65]) by mail.notmuchmail.org (Postfix) with ESMTPS id 4BE6720645 for ; Thu, 21 Oct 2021 05:56:40 -0400 (EDT) Received: from localhost (200116b8606430004cd9f5d7a042c115.dip.versatel-1u1.de [IPv6:2001:16b8:6064:3000:4cd9:f5d7:a042:c115]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: michael@grubix.eu) by mailproxy01.manitu.net (Postfix) with ESMTPSA id 966E31260054; Thu, 21 Oct 2021 11:51:23 +0200 (CEST) From: Michael J Gruber To: notmuch@notmuchmail.org Subject: [WIP PATCH 1/1] autodoc: fix search path for notmuch2 module Date: Thu, 21 Oct 2021 11:51:22 +0200 Message-Id: X-Mailer: git-send-email 2.33.0.1146.g7ac282475c In-Reply-To: References: MIME-Version: 1.0 Message-ID-Hash: MJYL2MOGIKMELVJNSJOP7EJNGV5U4N65 X-Message-ID-Hash: MJYL2MOGIKMELVJNSJOP7EJNGV5U4N65 X-MailFrom: git@grubix.eu X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.1 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1634810207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ZMPrJi+R0wTeEeKzImWf4Fw1GeJAOummkNsfAQa2naM=; b=Zq95ENz7ZuQn/rOElReC04sHfx5R7A+MV+TmQV9L1p6VaoQQorqjj1ONg1VE/+2RzB+wWN HedYhjlOrHNGEfQjQr9gdISAbJiKd4ODw2jwwj5pEtrmibKxiinXY+E1FI5CfuIToKH5K7 Ka4wv1TB4E1lmv/BIWaEQ2ngFQeamw5bwE6vznR7aACeLoegWDMHJAUA9Pnl8BKNIt6b3g GNOTSVD5B8a4EPf+heXBkeloAviTOz97pA7t1WhHlvqb0LVMvPkHErudU1bgRtzBldAAfU m0J9mnL3cerjAjHMvL4D/Hn1Up38UCga9hpV0rQAKAf/9MP40ldR4OtkbpPkKA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1634810207; a=rsa-sha256; cv=none; b=r32EcuTBBK+ZuZ62koWXVvvYRqYTxldMk8pg3Htt67z0p5Lr0urxjwBnTT8VJLtK/5rrDw /glWD1rvR/A/ni5P6IRIh+Sf0Uuz2broNvXkCznQaVks+R6YQ7ZhKrLZDlTOIXCIlx5/qr a+PHeNAbXF8T7Z30To0ufB3vdkuio/LXjNlXVJqGkV/2M9Vvnp6K5V4VqQ2IvwEsQXwUPe Fk9u00z5MozEZIy1KEzV0bAbzFwGN/AQM29tCHRDYsB553zFNkLq9zBJUkT6GqmPrsM8y1 +tP6TB/ZS7+GMZLJuTEBTAI9vcb4OWG5WPm//EcDKaCX0QhuLLKc5vrX0GMp5A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.16 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 144.217.243.247 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 7C970EDC8 X-Spam-Score: -1.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: lSMjHv+3k34m a05da455 ("doc: add new python bindings to main documentation tree.", 2020-07-11) added the path "bindings/python-cffi/notmuch2" to the search path for autodoc. But the notmuch2 module cannot be imported from there - the dir "is" the module, and it resides in "bindings/python-cffi" and in "bindings/python-cffi/build/stage", with only the latter location having the compiled capi part. This goes unnoticed as long as you have notmuch2 in your standard search path, but it means autodocs finds the wrong module, not the one one we are building the doc against. Fix the path so that the build tree module comes first. Signed-off-by: Michael J Gruber --- doc/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/conf.py b/doc/conf.py index 1fbd102b..c7fd8f5a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -25,7 +25,7 @@ for pathdir in ['.', '..']: version=infile.read().replace('\n','') # for autodoc -sys.path.insert(0, os.path.join(location, '..', 'bindings', 'python-cffi', 'notmuch2')) +sys.path.insert(0, os.path.join(location, '..', 'bindings', 'python-cffi', 'build', 'stage')) # read generated config for pathdir in ['.', '..']: -- 2.33.0.1146.g7ac282475c