Skip to content

Version deduplication #16

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.

Sign up for GitHub

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

Open
k-collie wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Version deduplication #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a5e038
Use importlib.metadata to get package version
k-collie Feb 3, 2025
0571c62
Remove VERSION file
k-collie Feb 3, 2025
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: 1 addition & 1 deletion MANIFEST.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include README.md MANIFEST.in setup.py .gitignore
recursive-include idlbridge *.py *.pyx *.pxd *.pxi *.pro VERSION
recursive-include idlbridge *.py *.pyx *.pxd *.pxi *.pro
recursive-include dev *
1 change: 0 additions & 1 deletion idlbridge/VERSION
View file
Open in desktop

This file was deleted.

8 changes: 7 additions & 1 deletion idlbridge/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,15 @@
import ctypes as _ctypes
from . import _core

try:
from importlib.metadata import version
except ImportError:
# try-except can be removed if requires-python set to >= 3.8
from importlib_metadata import version

__author__ = 'Dr. Alex Meakins'
__responsible_officer__ = 'Dr. Alex Meakins'
__version__ = "1.1.0"
__version__ = version("idlbridge")

# By default the core (IDL) library is opened by Python with RTLD_LOCAL
# preventing subsequently loaded IDL DLM libraries from seeing the IDL_*
Expand Down
6 changes: 4 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
name="idlbridge",
version=__version__,
description="An IDL wrapper for Python",
requires_python=">=3.4",
author='Dr. Alex Meakins',
author_email='alex.meakins@ukaea.uk',
license="LGPLv3",
Expand All @@ -96,8 +97,9 @@
"Operating System :: POSIX :: Linux",
"Topic :: Scientific/Engineering"
],
# setup_requires=["cython>=0.19"],
# install_requires=["cython>=0.19"],
install_requires=[
"importlib_metadata>=0.1 ; python_version < \"3.8\"",
],
packages=["idlbridge"],
ext_modules=cythonize(extensions, force=force, compiler_directives=directives)
)