Merge pull request #105 from python-odin/release/1.6.1

timsavage · web-flow · commit 351ecea7135e · 2021-04-27T18:48:35.000+10:00
Release/1.6.1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -64,4 +64,4 @@ jobs:
 
       - name: Upload to PyPI
         id: upload_to_pypi
-        run: poetry publish
+        run: poetry publish --username __token__ --password ${{ secrets.POETRY_PYPI_TOKEN_PYPI }}
diff --git a/HISTORY b/HISTORY
@@ -1,3 +1,8 @@
+1.6.1
+=====
+
+- Fix poetry config error that restricted Python versions > 3!
+
 1.6.0
 =====
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "odin"
-version = "1.6.0"
+version = "1.6.1"
 description = "Data-structure definition/validation/traversal, mapping and serialisation toolkit for Python"
 authors = ["Tim Savage <tim@savage.company>"]
 license = "BSD-3-Clause"
@@ -31,7 +31,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^2.7"
+python = "~2.7 || >=3.6 <3.10"
 six = "*"
 typing = {version="~=3.7.4", python = "~2.7" }
 enum34 = {version="*", python = "<3.4" }
diff --git a/src/odin/fields/future.py b/src/odin/fields/future.py
@@ -54,5 +54,5 @@ def to_python(self, value):
 
     def prepare(self, value):
         # type: (Optional[ET]) -> Any
-        if (value is not None) and (value in self.enum):
+        if (value is not None) and isinstance(value, self.enum):
             return value.value

-Original file line number
+Diff line change
 +1.6.1
 +=====
++
 +- Fix poetry config error that restricted Python versions > 3!
++
 .6.0
 =====