Skip to content

Commit f05794e

Browse files
authored
Merge pull request #61 from Embarcadero/docs
Doc files and more
2 parents 02602a1 + b3d2912 commit f05794e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+200350
-22
lines changed

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Disable any line endings auto conversion.
2+
* -text

.github/workflows/deploy-wheels.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
runs-on: ${{ matrix.os }}
5151
strategy:
5252
matrix:
53-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
53+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
5454
include:
5555
- os: [windows-latest]
5656
arch: ["x86"]
@@ -81,7 +81,7 @@ jobs:
8181
runs-on: ${{ matrix.os }}
8282
strategy:
8383
matrix:
84-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
84+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
8585
include:
8686
- os: [windows-latest]
8787
arch: ["AMD64"]
@@ -112,9 +112,9 @@ jobs:
112112
runs-on: ${{ matrix.os }}
113113
strategy:
114114
matrix:
115-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
115+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
116116
include:
117-
- os: [ubuntu-latest]
117+
- os: [ubuntu-20.04] #ubuntu-latest doesn't supports cp36
118118
arch: ["x86_64"]
119119
steps:
120120
- name: Check out repository
@@ -142,7 +142,7 @@ jobs:
142142
runs-on: ${{ matrix.os }}
143143
strategy:
144144
matrix:
145-
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
145+
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
146146
include:
147147
- os: [macos-latest]
148148
arch: ["x86_64"]
@@ -172,7 +172,7 @@ jobs:
172172
runs-on: ${{ matrix.os }}
173173
strategy:
174174
matrix:
175-
python: ['3.8', '3.9', '3.10']
175+
python: ['3.8', '3.9', '3.10', '3.11']
176176
include:
177177
- os: [macos-latest]
178178
arch: ["arm64"]

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@ There is an free [eBook and styles bundle](https://embt.co/PythonGUIBundle) with
2424

2525
### Supports
2626
* Win32 x86, Win64 x86, Linux64 x86, Android64, macOS64 and macM1 architectures
27-
* Python cp3.6, cp3.7, cp3.8, cp3.9 and cp3.10
27+
* Python cp3.6, cp3.7, cp3.8, cp3.9, cp3.10 and cp3.11
2828

2929
### Conda support
30-
* Win x86 and x64 from Python cp3.6 to cp3.10
31-
* Linux x86_64 from Python cp3.6 to cp3.10
32-
* macOS x86_64 from Python cp3.6 to cp3.10
30+
* Win x86 and x64 from Python cp3.6 to cp3.11
31+
* Linux x86_64 from Python cp3.6 to cp3.11
32+
* macOS x86_64 from Python cp3.6 to cp3.11
3333

3434
### Venv support
35-
* Win x86 and x64 from Python cp3.6 to cp3.10
36-
* Linux x86_64 from Python cp3.6 to cp3.10
37-
* macOS x86_64 from Python cp3.6 to cp3.10
35+
* Win x86 and x64 from Python cp3.6 to cp3.11
36+
* Linux x86_64 from Python cp3.6 to cp3.11
37+
* macOS x86_64 from Python cp3.6 to cp3.11
3838

3939
## See Also
4040

delphifmx/__init__.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import sys, os, sys, platform
1+
import sys, os, sys, platform, ctypes
22
from os import environ
33
import importlib, importlib.machinery, importlib.util
44

@@ -13,7 +13,7 @@ def findmodule():
1313
libdir = None
1414
libext = None
1515

16-
if not (pyver in ["3.6", "3.7", "3.8", "3.9", "3.10"]):
16+
if not (pyver in ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]):
1717
raise PyVerNotSupported(f"DelphiFMX doesn't support Python{pyver}.")
1818

1919
if ossys == "Windows":
@@ -60,8 +60,24 @@ def findmodule():
6060
else:
6161
raise ValueError("Unsupported platform.")
6262

63+
def findfixup(dir, libext):
64+
for fname in os.listdir(dir):
65+
if ('libFixup' in fname) and (fname.endswith(libext)):
66+
return os.path.join(dir, os.path.basename(fname))
67+
6368
def new_import():
6469
modulefullpath = findmodule()
70+
71+
#Look for a fixup lib
72+
base_path = os.path.basename(modulefullpath)
73+
if base_path:
74+
_, ext = os.path.splitext(modulefullpath)
75+
#Try to find the fixup lib based on the module path
76+
fixup_lib = findfixup(base_path, ext)
77+
if fixup_lib:
78+
#Loads the fixup lib
79+
ctypes.cdll.LoadLibrary(fixup_lib)
80+
6581
loader = importlib.machinery.ExtensionFileLoader("DelphiFMX", modulefullpath)
6682
spec = importlib.util.spec_from_file_location("DelphiFMX", modulefullpath,
6783
loader=loader, submodule_search_locations=None)

delphifmx/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.1.51"
1+
__version__ = "1.0.0"

0 commit comments

Comments
 (0)