Skip to content

Commit

Permalink
Merge pull request #837 from bertsky/fix-py38-build
Browse files Browse the repository at this point in the history
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)
  • Loading branch information
asmorkalov authored May 29, 2023
2 parents 264e05b + 76e62b2 commit 0ba2c80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion find_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
else:
# local version identifier, not to be published on PyPI
version = git_hash
opencv_version += ".{}".format(version)
opencv_version += "+{}".format(version)

with open("cv2/version.py", "w") as f:
f.write('opencv_version = "{}"\n'.format(opencv_version))
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ requires = [
"scikit-build>=0.13.2",
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.3; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
"numpy==1.19.3; python_version<='3.9' and sys_platform == 'linux' and platform_machine == 'aarch64'",
"numpy==1.21.0; python_version<='3.9' and sys_platform == 'darwin' and platform_machine == 'arm64'",
"numpy==1.19.3; python_version=='3.9' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
Expand Down

0 comments on commit 0ba2c80

Please sign in to comment.