Skip to content

Commit 365c59e

Browse files
committed
small cleanup
1 parent f431eca commit 365c59e

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

.github/workflows/wheels.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ jobs:
125125
env:
126126
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
127127

128-
- uses: actions/upload-artifact@v5.0.0
128+
- name: Upload wheels
129+
uses: actions/upload-artifact@v5.0.0
129130
with:
130131
path: ./wheelhouse/*.whl
131132
name: xmlsec-wheel-${{ matrix.only }}

build_support/build_ext.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,18 @@
99

1010

1111
class build_ext(build_ext_orig):
12-
def info(self, message):
13-
self.announce(message, level=log.INFO)
12+
def __init__(self, *args, **kwargs) -> None:
13+
super().__init__(*args, **kwargs)
1414

15-
def run(self):
16-
ext = self.ext_map['xmlsec']
1715
self.debug = os.environ.get('PYXMLSEC_ENABLE_DEBUG', False)
1816
self.static = os.environ.get('PYXMLSEC_STATIC_DEPS', False)
1917
self.size_opt = os.environ.get('PYXMLSEC_OPTIMIZE_SIZE', True)
2018

19+
def info(self, message) -> None:
20+
self.announce(message, level=log.INFO)
21+
22+
def run(self) -> None:
23+
ext = self.ext_map['xmlsec']
2124
if self.static or sys.platform == 'win32':
2225
helper = StaticBuildHelper(self)
2326
helper.prepare(sys.platform)

build_support/static_build.py

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,12 @@ def _prepare_unix_build(self, build_platform):
147147
self._configure_extension_for_static(build_platform)
148148

149149
def _capture_version_overrides(self):
150-
builder = self.builder
151-
builder.openssl_version = os.environ.get('PYXMLSEC_OPENSSL_VERSION', '3.6.0')
152-
builder.libiconv_version = os.environ.get('PYXMLSEC_LIBICONV_VERSION', '1.18')
153-
builder.libxml2_version = os.environ.get('PYXMLSEC_LIBXML2_VERSION', '2.14.6')
154-
builder.libxslt_version = os.environ.get('PYXMLSEC_LIBXSLT_VERSION', '1.1.43')
155-
builder.zlib_version = os.environ.get('PYXMLSEC_ZLIB_VERSION', '1.3.1')
156-
builder.xmlsec1_version = os.environ.get('PYXMLSEC_XMLSEC1_VERSION', '1.3.9')
150+
self.builder.openssl_version = os.environ.get('PYXMLSEC_OPENSSL_VERSION', '3.6.0')
151+
self.builder.libiconv_version = os.environ.get('PYXMLSEC_LIBICONV_VERSION', '1.18')
152+
self.builder.libxml2_version = os.environ.get('PYXMLSEC_LIBXML2_VERSION', '2.14.6')
153+
self.builder.libxslt_version = os.environ.get('PYXMLSEC_LIBXSLT_VERSION', '1.1.43')
154+
self.builder.zlib_version = os.environ.get('PYXMLSEC_ZLIB_VERSION', '1.3.1')
155+
self.builder.xmlsec1_version = os.environ.get('PYXMLSEC_XMLSEC1_VERSION', '1.3.9')
157156

158157
def _ensure_source_archives(self):
159158
return [

0 commit comments

Comments
 (0)