Skip to content

Doc files and more #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Mar 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Disable any line endings auto conversion.
* -text
12 changes: 6 additions & 6 deletions .github/workflows/deploy-wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
include:
- os: [windows-latest]
arch: ["x86"]
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
include:
- os: [windows-latest]
arch: ["AMD64"]
Expand Down Expand Up @@ -112,9 +112,9 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
include:
- os: [ubuntu-latest]
- os: [ubuntu-20.04] #ubuntu-latest doesn't supports cp36
arch: ["x86_64"]
steps:
- name: Check out repository
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
python: ['3.6', '3.7', '3.8', '3.9', '3.10', '3.11']
include:
- os: [macos-latest]
arch: ["x86_64"]
Expand Down Expand Up @@ -172,7 +172,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python: ['3.8', '3.9', '3.10']
python: ['3.8', '3.9', '3.10', '3.11']
include:
- os: [macos-latest]
arch: ["arm64"]
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ There is an free [eBook and styles bundle](https://embt.co/PythonGUIBundle) with

### Supports
* Win32 x86, Win64 x86, Linux64 x86, Android64, macOS64 and macM1 architectures
* Python cp3.6, cp3.7, cp3.8, cp3.9 and cp3.10
* Python cp3.6, cp3.7, cp3.8, cp3.9, cp3.10 and cp3.11

### Conda support
* Win x86 and x64 from Python cp3.6 to cp3.10
* Linux x86_64 from Python cp3.6 to cp3.10
* macOS x86_64 from Python cp3.6 to cp3.10
* Win x86 and x64 from Python cp3.6 to cp3.11
* Linux x86_64 from Python cp3.6 to cp3.11
* macOS x86_64 from Python cp3.6 to cp3.11

### Venv support
* Win x86 and x64 from Python cp3.6 to cp3.10
* Linux x86_64 from Python cp3.6 to cp3.10
* macOS x86_64 from Python cp3.6 to cp3.10
* Win x86 and x64 from Python cp3.6 to cp3.11
* Linux x86_64 from Python cp3.6 to cp3.11
* macOS x86_64 from Python cp3.6 to cp3.11

## See Also

Expand Down
20 changes: 18 additions & 2 deletions delphifmx/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import sys, os, sys, platform
import sys, os, sys, platform, ctypes
from os import environ
import importlib, importlib.machinery, importlib.util

Expand All @@ -13,7 +13,7 @@ def findmodule():
libdir = None
libext = None

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

if ossys == "Windows":
Expand Down Expand Up @@ -60,8 +60,24 @@ def findmodule():
else:
raise ValueError("Unsupported platform.")

def findfixup(dir, libext):
for fname in os.listdir(dir):
if ('libFixup' in fname) and (fname.endswith(libext)):
return os.path.join(dir, os.path.basename(fname))

def new_import():
modulefullpath = findmodule()

#Look for a fixup lib
base_path = os.path.basename(modulefullpath)
if base_path:
_, ext = os.path.splitext(modulefullpath)
#Try to find the fixup lib based on the module path
fixup_lib = findfixup(base_path, ext)
if fixup_lib:
#Loads the fixup lib
ctypes.cdll.LoadLibrary(fixup_lib)

loader = importlib.machinery.ExtensionFileLoader("DelphiFMX", modulefullpath)
spec = importlib.util.spec_from_file_location("DelphiFMX", modulefullpath,
loader=loader, submodule_search_locations=None)
Expand Down
2 changes: 1 addition & 1 deletion delphifmx/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.1.51"
__version__ = "1.0.0"
Loading