Skip to content

Commit 41598d3

Browse files
Merge pull request #2 from yamadayamato/master
Works on bP 18.1
2 parents e919ae1 + 919c9e0 commit 41598d3

File tree

9 files changed

+56
-9
lines changed

9 files changed

+56
-9
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
__pycache__
2+
env
3+
*~
4+
settings.ini

PyCoder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/python3
1+
#!/usr/bin/env python3
22
#*********************************************************************************************************
33
#* __ __ __ ______ __ __ _______ _______ *
44
#* | |--.| |.---.-..----.| |--.| __ \.---.-..-----.| |_| |--..-----..----. | | __| *

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PyCoder - The LightWare Python IDE based on Qt5
22
=====
33
Developing by blackPanther OS Project - www.blackpanther.hu
4-
Credits: Harrison Amoatey (Qt4 version develompent)
4+
Credits: Harrison Amoatey (Qt4 version development)
55

66
## Python 3 IDE
77

cx_Freeze/_compat.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,13 @@
66
import sysconfig
77
from pathlib import Path
88

9-
if sys.version_info >= (3, 10):
10-
import importlib.metadata as importlib_metadata
11-
else:
12-
from setuptools.extern import importlib_metadata
9+
try:
10+
import importlib_metadata
11+
except:
12+
try:
13+
from importlib import metadata as importlib_metadata
14+
except:
15+
from setuptools.extern import importlib_metadata
1316

1417
__all__ = ["cached_property", "importlib_metadata"]
1518
__all__ += ["PLATFORM", "IS_LINUX", "IS_MACOS", "IS_MINGW", "IS_WINDOWS"]

cx_Freeze/command/bdist_rpm.py

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,30 @@
1414
from sysconfig import get_python_version
1515

1616
from setuptools import Command
17-
from setuptools.errors import ExecError, FileError, OptionError, PlatformError
17+
18+
try:
19+
from setuptools.errors import ExecError
20+
except:
21+
class ExecError(Exception):
22+
pass
23+
24+
try:
25+
from setuptools.errors import FileError
26+
except:
27+
class FileError(Exception):
28+
pass
29+
30+
try:
31+
from setuptools.errors import OptionError
32+
except:
33+
class OptionError(Exception):
34+
pass
35+
36+
try:
37+
from setuptools.errors import PlatformError
38+
except:
39+
class PlatformError(Exception):
40+
pass
1841

1942
# If DISTUTILS_DEBUG is anything other than the empty string, we run in
2043
# debug mode.

cx_Freeze/command/build_exe.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
from sysconfig import get_platform, get_python_version
99

1010
from setuptools import Command
11-
from setuptools.errors import SetupError
11+
try:
12+
from setuptools.errors import SetupError
13+
except:
14+
class SetupError(Exception):
15+
pass
1216

1317
from ..common import normalize_to_list
1418
from ..freezer import Freezer

cx_Freeze/executable.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99
from sysconfig import get_config_var, get_platform
1010

1111
from setuptools import Distribution
12-
from setuptools.errors import SetupError
12+
try:
13+
from setuptools.errors import SetupError
14+
except:
15+
class SetupError(Exception):
16+
pass
1317

1418
from ._compat import IS_MINGW, IS_WINDOWS
1519
from .common import get_resource_file_path, validate_args

pyproject.toml

Whitespace-only changes.

requirements.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
importlib-metadata==6.1.0
2+
packaging==23.0
3+
PyQt5==5.14.2
4+
PyQt5-sip==12.11.1
5+
pytoolconfig==1.2.5
6+
QScintilla==2.11.4
7+
tomli==2.0.1
8+
typing_extensions==4.5.0
9+
zipp==3.15.0

0 commit comments

Comments
 (0)