mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-07 04:20:07 +01:00
Merge pull request #1241 from wxWidgets/fix-pathlib-dep
Install and use pathlib2 only for Python2
This commit is contained in:
7
build.py
7
build.py
@@ -27,7 +27,10 @@ import tarfile
|
||||
import tempfile
|
||||
import datetime
|
||||
|
||||
import pathlib2
|
||||
try:
|
||||
import pathlib
|
||||
except ImportError:
|
||||
import pathlib2 as pathlib
|
||||
|
||||
from distutils.dep_util import newer, newer_group
|
||||
from buildtools.config import Config, msg, opj, posixjoin, loadETG, etg2sip, findCmd, \
|
||||
@@ -1183,7 +1186,7 @@ def cmd_sip(options, args):
|
||||
def cmd_touch(options, args):
|
||||
cmdTimer = CommandTimer('touch')
|
||||
pwd = pushDir(phoenixDir())
|
||||
etg = pathlib2.Path('etg')
|
||||
etg = pathlib.Path('etg')
|
||||
for item in etg.glob('*.py'):
|
||||
item.touch()
|
||||
|
||||
|
||||
@@ -9,4 +9,4 @@ requests
|
||||
pytest
|
||||
pytest-xdist
|
||||
pytest-timeout
|
||||
pathlib2
|
||||
pathlib2 ; python_version < "3"
|
||||
|
||||
Reference in New Issue
Block a user