Skip to content

Commit

Permalink
Merge pull request #2747 from misl6/release-2023.02.10
Browse files Browse the repository at this point in the history
* Update `pydantic` recipe

There is [incompatibility](huggingface/transformers#8638) between python > 3.6 and package `dataclasses`.

This error was happening after my compilations: `AttributeError: module 'typing' has no attribute '_ClassVar'`

The fix is removing `dataclasses` from `python_depends`.

I also updated the pydantic version to the newest release `1.10.4`, it can be checked [here](https://github.com/pydantic/pydantic/releases) and its url.

I already compiled my app after applying these changes, and the compilation is working successfully again.

* Restrict sh version to sh>=1.10, <2.0 (#2746)

keep sh version under 2.0 as default behaviour was switched

* Update CHANGELOG.md and update version to 2023.02.10

---------

Co-authored-by: Filipe Marchesini <filipe.marchesini@gmail.com>
Co-authored-by: Andre Miras <AndreMiras@users.noreply.github.com>
Co-authored-by: HyTurtle <81598434+HyTurtle@users.noreply.github.com>
  • Loading branch information
4 people authored Feb 11, 2023
2 parents ee9c257 + 9b52825 commit 56bf733
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 5 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## [v2023.02.10](https://github.com/kivy/python-for-android/tree/v2023.02.10) (2023-02-10)

[Full Changelog](https://github.com/kivy/python-for-android/compare/v2023.01.28...v2023.02.10)

**Closed issues:**

- AttributeError: 'str' object has no attribute 'stdout' [\#2745](https://github.com/kivy/python-for-android/issues/2745)
- Android app crash on starting up by accessing texture. Error:No module named 'typing\_extensions' [\#2743](https://github.com/kivy/python-for-android/issues/2743)

**Merged pull requests:**

- restrict sh version [\#2746](https://github.com/kivy/python-for-android/pull/2746) ([HyTurtle](https://github.com/HyTurtle))
- 🐛 fix: Update `pydantic` recipe [\#2742](https://github.com/kivy/python-for-android/pull/2742) ([FilipeMarch](https://github.com/FilipeMarch))
- Merge master into develop [\#2741](https://github.com/kivy/python-for-android/pull/2741) ([misl6](https://github.com/misl6))

## [v2023.01.28](https://github.com/kivy/python-for-android/tree/v2023.01.28) (2023-01-28)

[Full Changelog](https://github.com/kivy/python-for-android/compare/v2022.12.20...v2023.01.28)
Expand Down
2 changes: 1 addition & 1 deletion pythonforandroid/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '2023.01.28'
__version__ = '2023.02.10'
6 changes: 3 additions & 3 deletions pythonforandroid/recipes/pydantic/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@


class PydanticRecipe(PythonRecipe):
version = '1.8.2'
url = 'https://github.com/samuelcolvin/pydantic/archive/refs/tags/v{version}.zip'
version = '1.10.4'
url = 'https://github.com/pydantic/pydantic/archive/refs/tags/v{version}.zip'
depends = ['setuptools']
python_depends = ['Cython', 'devtools', 'email-validator', 'dataclasses', 'typing-extensions', 'python-dotenv']
python_depends = ['Cython', 'devtools', 'email-validator', 'typing-extensions', 'python-dotenv']
call_hostpython_via_targetpython = False


Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# https://github.com/kivy/buildozer/issues/722
install_reqs = [
'appdirs', 'colorama>=0.3.3', 'jinja2',
'sh>=1.10; sys_platform!="nt"',
'sh>=1.10, <2.0; sys_platform!="nt"',
'pep517', 'toml', 'packaging',
]
# (pep517 and toml are used by pythonpackage.py)
Expand Down

0 comments on commit 56bf733

Please sign in to comment.