Skip to content

Commit bdd44e9

Browse files
authored
BLD: Fix version script (#54525)
* BLD: Fix the version generation script * Update config.yml * Update config.yml
1 parent 1bffa5e commit bdd44e9

File tree

3 files changed

+25
-5
lines changed

3 files changed

+25
-5
lines changed

.circleci/config.yml

+1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
fi
4747
- run:
4848
name: Build aarch64 wheels
49+
no_output_timeout: 30m # Sometimes the tests won't generate any output, make sure the job doesn't get killed by that
4950
command: |
5051
pip3 install cibuildwheel==2.14.1
5152
cibuildwheel --prerelease-pythons --output-dir wheelhouse

generate_version.py

+23-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,30 @@
11
# Note: This file has to live next to setup.py or versioneer will not work
22
import argparse
33
import os
4+
import sys
45

56
import versioneer
67

8+
sys.path.insert(0, "")
9+
710

811
def write_version_info(path):
12+
version = None
13+
git_version = None
14+
15+
try:
16+
import _version_meson
17+
18+
version = _version_meson.__version__
19+
git_version = _version_meson.__git_version__
20+
except ImportError:
21+
version = versioneer.get_version()
22+
git_version = versioneer.get_versions()["full-revisionid"]
923
if os.environ.get("MESON_DIST_ROOT"):
1024
path = os.path.join(os.environ.get("MESON_DIST_ROOT"), path)
1125
with open(path, "w", encoding="utf-8") as file:
12-
file.write(f'__version__="{versioneer.get_version()}"\n')
13-
file.write(
14-
f'__git_version__="{versioneer.get_versions()["full-revisionid"]}"\n'
15-
)
26+
file.write(f'__version__="{version}"\n')
27+
file.write(f'__git_version__="{git_version}"\n')
1628

1729

1830
def main():
@@ -43,7 +55,13 @@ def main():
4355
write_version_info(args.outfile)
4456

4557
if args.print:
46-
print(versioneer.get_version())
58+
try:
59+
import _version_meson
60+
61+
version = _version_meson.__version__
62+
except ImportError:
63+
version = versioneer.get_version()
64+
print(version)
4765

4866

4967
main()

scripts/validate_unwanted_patterns.py

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
"_global_config",
5050
"_chained_assignment_msg",
5151
"_chained_assignment_method_msg",
52+
"_version_meson",
5253
}
5354

5455

0 commit comments

Comments
 (0)