Skip to content

Commit

Permalink
Use Python 3 in CircleCI (#215)
Browse files Browse the repository at this point in the history
  • Loading branch information
vorlock authored and jtv committed Sep 1, 2019
1 parent a6b1d60 commit 7e18ca2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- checkout
- run:
name: Install
command: apt update && apt install -y python g++ libpq-dev postgresql build-essential make autoconf dh-autoreconf autoconf-archive automake cppcheck
command: apt update && apt install -y python3 g++ libpq-dev postgresql build-essential make autoconf dh-autoreconf autoconf-archive automake cppcheck
- run:
name: Identify
command: lsb_release -a && c++ --version
Expand Down
8 changes: 4 additions & 4 deletions tools/splitconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3

"""Extract configuration items into various configuration headers.
Expand Down Expand Up @@ -183,15 +183,15 @@ def generate_config(source_tree, header_lines, items, publication, factor):
unicode_path = config_file.encode(guess_output_encoding(), 'replace')
section = extract_section(header_lines, items, publication, factor)
if len(section) == 0:
print("Generating %s: no items--skipping." % unicode_path)
print("Generating {}: no items--skipping.".format(unicode_path))
return

contents = compose_header(section, publication, factor)
if read_text_file(config_file) == contents:
print("Generating %s: no changes--skipping." % unicode_path)
print("Generating {}: no changes--skipping.".format(unicode_path))
return

print("Generating %s: %d item(s)." % (unicode_path, len(section)))
print("Generating {}: {} item(s).".format(unicode_path, len(section)))
path = encode_path(config_file)
with codecs.open(path, 'wb', encoding='ascii') as header:
header.write(contents)
Expand Down
2 changes: 1 addition & 1 deletion tools/template2mak.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/env python
#! /usr/bin/env python3
"""Minimal macro processor. Used for generating VC++ makefiles.
The available template commands are:
Expand Down
2 changes: 1 addition & 1 deletion win32/INSTALL.txt
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ iii) If you are building libpqxx from a development source tree rather than from
a release distribution, you may not have the makefiles for your compiler.
These makefiles should be in the `win32` directory and have names ending in
".mak": "mingw.mak," "vc-libpqxx.mak," "vc-test.mak," and so on. If you
don't have these files but you do have a python interpreter, you can
don't have these files but you do have a python3 interpreter, you can
generate them using the template2mak.py script in the tools directory:

tools/template2mak.py win32/mingw.mak.template win32/mingw.mak
Expand Down

0 comments on commit 7e18ca2

Please sign in to comment.