Skip to content

Commit

Permalink
patch upgrade to pull in cppyy-backend 1.15.2 to fix an installation …
Browse files Browse the repository at this point in the history
…problem when installing outside a virtual environment
  • Loading branch information
wlav committed Nov 15, 2023
1 parent 33c1f91 commit f782cd7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 3 additions & 1 deletion doc/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@ See :doc:`packages <packages>`, for details on the package structure.
PyPy support lags CPython support.


2023-11-13: 3.1.1
2023-11-15: 3.1.2
-----------------

* Deprecate 3.1.1 b/c of an installation problem outside of virtualenv
* Fix installation problem when purelib and platlib differ
* Alt fix for "failed to materialize symbols" on some Linux systems


Expand Down
2 changes: 1 addition & 1 deletion installer/cppyy_monkey_patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def get_requires_for_build_wheel(*args, **kwds):
requirements = ['cppyy-cling<=6.18.2.3']
except ImportError:
# CPython
requirements = ['cppyy-backend==1.15.1', 'cppyy-cling==6.30.0']
requirements = ['cppyy-backend==1.15.2', 'cppyy-cling==6.30.0']

return requirements + _get_requires_for_build_wheel(*args, **kwds)

Expand Down
2 changes: 1 addition & 1 deletion python/cppyy/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '3.1.1'
__version__ = '3.1.2'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
try:
import __pypy__, sys
version = sys.pypy_version_info
requirements = ['cppyy-backend==1.15.1', 'cppyy-cling==6.30.0']
requirements = ['cppyy-backend==1.15.2', 'cppyy-cling==6.30.0']
if version[0] == 5:
if version[1] <= 9:
requirements = ['cppyy-backend<0.3', 'cppyy-cling<6.12']
Expand All @@ -23,7 +23,7 @@
requirements = ['cppyy-backend<=1.10', 'cppyy-cling<=6.18.2.3']
except ImportError:
# CPython
requirements = ['CPyCppyy==1.12.15', 'cppyy-backend==1.15.1', 'cppyy-cling==6.30.0']
requirements = ['CPyCppyy==1.12.16', 'cppyy-backend==1.15.2', 'cppyy-cling==6.30.0']

setup_requirements = ['wheel']
if 'build' in sys.argv or 'install' in sys.argv:
Expand Down

0 comments on commit f782cd7

Please sign in to comment.