diff options
| -rw-r--r-- | setup.py | 24 | ||||
| m--------- | sources/pyside2 | 13 | ||||
| m--------- | sources/pyside2-tools | 0 | ||||
| m--------- | sources/shiboken2 | 16 |
4 files changed, 28 insertions, 25 deletions
@@ -287,7 +287,7 @@ for n in ["pyside_package", "build", "PySide2-%s" % __version__]: print('ignored error: {}'.format(e)) # Prepare package folders -for pkg in ["pyside_package/PySide2", "pyside_package/pysideuic"]: +for pkg in ["pyside_package/PySide2", "pyside_package/pyside2uic"]: pkg_dir = os.path.join(script_dir, pkg) os.makedirs(pkg_dir) @@ -711,15 +711,15 @@ class pyside_build(_build): "{site_packages_dir}/shiboken2.so", "{dist_dir}/PySide2/shiboken2.so", vars=vars) - # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic + # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic copydir( - "{site_packages_dir}/pysideuic", - "{dist_dir}/pysideuic", + "{site_packages_dir}/pyside2uic", + "{dist_dir}/pyside2uic", force=False, vars=vars) if sys.version_info[0] > 2: - rmtree("{dist_dir}/pysideuic/port_v2".format(**vars)) + rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars)) else: - rmtree("{dist_dir}/pysideuic/port_v3".format(**vars)) + rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars)) # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py makefile( "{dist_dir}/PySide2/scripts/__init__.py", @@ -838,15 +838,15 @@ class pyside_build(_build): "{build_dir}/shiboken2/shibokenmodule/shiboken2{dbgPostfix}.pdb", "{dist_dir}/PySide2/shiboken2{dbgPostfix}.pdb", vars=vars) - # <install>/lib/site-packages/pysideuic/* -> <setup>/pysideuic + # <install>/lib/site-packages/pyside2uic/* -> <setup>/pyside2uic copydir( - "{site_packages_dir}/pysideuic", - "{dist_dir}/pysideuic", + "{site_packages_dir}/pyside2uic", + "{dist_dir}/pyside2uic", force=False, vars=vars) if sys.version_info[0] > 2: - rmtree("{dist_dir}/pysideuic/port_v2".format(**vars)) + rmtree("{dist_dir}/pyside2uic/port_v2".format(**vars)) else: - rmtree("{dist_dir}/pysideuic/port_v3".format(**vars)) + rmtree("{dist_dir}/pyside2uic/port_v3".format(**vars)) # <install>/bin/pyside2-uic -> PySide2/scripts/uic.py makefile( "{dist_dir}/PySide2/scripts/__init__.py", @@ -1049,7 +1049,7 @@ setup( url = 'http://www.pyside.org', download_url = 'https://download.qt-project.org/official_releases/pyside2/', license = 'LGPL', - packages = ['PySide2', 'pysideuic'], + packages = ['PySide2', 'pyside2uic'], package_dir = {'': 'pyside_package'}, include_package_data = True, zip_safe = False, diff --git a/sources/pyside2 b/sources/pyside2 -Subproject 7006f35459fb41db6f5087217c1cdc0354a3856 +Subproject 131fdfd1a89a257094148c07c630f136752c703 diff --git a/sources/pyside2-tools b/sources/pyside2-tools -Subproject 7d3823d1cae8fd893d284a72dd603fdeed54eff +Subproject 1eb5ccf5208d775e1e70b2332d9a61df0061280 diff --git a/sources/shiboken2 b/sources/shiboken2 -Subproject d597c044d1938975cda33a0bfeafd6becb9c9ec +Subproject 6064eadc4e861315240e5d61ed4dbf91764bd35 |