Skip to content

Commit 0ba2c80

Browse files
authored
Merge pull request #837 from bertsky/fix-py38-build
fixes #836 i.e. - ability to build untagged commits manually using pip wheel (ensuring the version conforms to PEP 440, and to our actual documentation, by using + instead of .) - ability to compile against current OpenCV on Python 3.8 (using numpy 1.17.5 instead of 1.17.3 which does not compile anymore)
2 parents 264e05b + 76e62b2 commit 0ba2c80

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

find_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
else:
6666
# local version identifier, not to be published on PyPI
6767
version = git_hash
68-
opencv_version += ".{}".format(version)
68+
opencv_version += "+{}".format(version)
6969

7070
with open("cv2/version.py", "w") as f:
7171
f.write('opencv_version = "{}"\n'.format(opencv_version))

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ requires = [
44
"scikit-build>=0.13.2",
55
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
66
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
7-
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
7+
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
88
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
99
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
1010
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",

0 commit comments

Comments
 (0)