Merge branch 'master' of github.com:briancappello/py-meta-utils

briancappello · Jan 25, 2020 · 768ca13 · 768ca13
2 parents 8ebf9b1 + 8de20be
commit 768ca13
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # CHANGELOG
 
-## 0.7.6 (unreleased)
+## 0.7.7 (unreleased)
 
 - fix bug with `_missing` equality check
 
+## 0.7.6 (2019/04/11)
+
+- propagate `__classcell__` to `type.__new__` in `OptionalMetaclass.__new__`
+
 ## 0.7.5 (2019/02/25)
 
 - fix project name on PyPI having spaces

diff --git a/py_meta_utils.py b/py_meta_utils.py
@@ -496,7 +496,8 @@ class Optional(metaclass=SomeMetaclass):
     __optional_class = None
 
     def __new__(mcs, name, bases, clsdict):
-        mcs.__optional_class = super().__new__(mcs, name, bases, clsdict)
+        if mcs.__optional_class is None or '__classcell__' in clsdict:
+            mcs.__optional_class = super().__new__(mcs, name, bases, clsdict)
         return mcs.__optional_class
 
     def __getattr__(self, item):

diff --git a/setup.cfg b/setup.cfg
@@ -10,7 +10,7 @@ testpaths = tests
 addopts = -s
 
 [bumpversion]
-current_version = 0.7.5
+current_version = 0.7.6
 parse =
     (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)          # major, minor and patch
     (?:\-(?P<pre>(?:dev|alpha|beta|rc))\.(?P<prenum>\d+))?  # pre-release

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='Py-Meta-Utils',
-    version='0.7.5',
+    version='0.7.6',
     description='Metaclass utilities for Python',
     long_description=long_description,
     long_description_content_type='text/markdown',