Skip to content

Commit 35efe43

Browse files
Manual revert of 416b66b changes to setup.py as its no longer needed, due to setuptools-dso 2.1 having the required fix already in it, when used alongside new environment variable in CI.
1 parent af3cca5 commit 35efe43

3 files changed

Lines changed: 3 additions & 12 deletions

File tree

‎.github/workflows/code.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
# https://github.com/mdavidsaver/setuptools_dso/issues/17
9393
CIBW_REPAIR_WHEEL_COMMAND: ""
9494
CIBW_MANYLINUX_X86_64_IMAGE: manylinux1
95+
CIBW_ENVIRONMENT_LINUX: SETUPTOOLS_DSO_PLAT_NAME=manylinux1_x86_64
9596

9697
- name: Upload Wheel and Sdist
9798
uses: actions/upload-artifact@v2

‎pyproject.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[build-system]
2-
requires = ["setuptools", "wheel", "setuptools_dso==2.0", "epicscorelibs>=7.0.6.99.1.0a1"]
2+
requires = ["setuptools", "wheel", "setuptools_dso>=2.1", "epicscorelibs>=7.0.6.99.1.0a1"]
33
build-backend = "setuptools.build_meta:__legacy__"

‎setup.py‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import epicscorelibs.version
77
from setuptools_dso import Extension, setup
88
from epicscorelibs.config import get_config_var
9-
from wheel.bdist_wheel import bdist_wheel
109

1110
# Place the directory containing _version_git on the path
1211
for path, _, filenames in os.walk(os.path.dirname(os.path.abspath(__file__))):
@@ -100,18 +99,9 @@ def install_for_development(self):
10099
os.symlink(os.path.join(self.install_dir, "epicscorelibs"), link)
101100

102101

103-
class Wheel(bdist_wheel):
104-
def get_tag(self):
105-
impl, abi_tag, plat_name = bdist_wheel.get_tag(self)
106-
# We want to produce manylinux tagged builds, but can't use
107-
# auditwheel as it isn't compatible with setuptools_dso
108-
# override the tag here as cibuildwheel won't let us do this
109-
plat_name = os.environ.get("AUDITWHEEL_PLAT", plat_name)
110-
return (impl, abi_tag, plat_name)
111-
112102

113103
setup(
114-
cmdclass=dict(develop=Develop, bdist_wheel=Wheel, **get_cmdclass()),
104+
cmdclass=dict(develop=Develop, **get_cmdclass()),
115105
version=__version__,
116106
ext_modules = [ext],
117107
install_requires = [

0 commit comments

Comments
 (0)