]> granicus.if.org Git - esp-idf/commitdiff
Merge branch 'feature/py23_kconfig_new' into 'master'
authorIvan Grokhotkov <ivan@espressif.com>
Thu, 27 Sep 2018 03:26:32 +0000 (11:26 +0800)
committerIvan Grokhotkov <ivan@espressif.com>
Thu, 27 Sep 2018 03:26:32 +0000 (11:26 +0800)
tools: Make kconfig_new Python3-compatible and enable Python3 in idf.py

See merge request idf/esp-idf!3304

1  2 
.gitlab-ci.yml
tools/kconfig_new/gen_kconfig_doc.py

diff --cc .gitlab-ci.yml
Simple merge
index d16be858f4e83f2414500efd2a47ca83e7bcefae,b43106ff31acbf4ae9ffa95df07a2a84ff10804d..af73c886d4805ba6a1cec5516a7ff48847792354
@@@ -20,8 -20,8 +20,9 @@@
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
+ from __future__ import print_function
  import os
 +import re
  import kconfiglib
  
  # Indentation to be used in the generated file