Skip to content

Commit

Permalink
Update Python and Kivy version, fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtemSBulgakov committed Apr 27, 2022
1 parent dc66ba6 commit 180f344
Show file tree
Hide file tree
Showing 19 changed files with 43 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .ci/move_binary.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"git",
"fetch",
f"origin/{data_repository}",
"--depth=0",
"--depth=1",
"--force",
]
)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-demos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ jobs:
uses: actions/setup-python@v2
if: github.event_name == 'push'
with:
python-version: 3.7
python-version: '3.10'
architecture: x64

- name: Push binary to kivymd/storage repository (binaries branch)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
# dist: [bdist_wheel]
include:
- os: ubuntu-latest # Modify one element to build source distribution
python-version: 3.7
python-version: '3.10'
architecture: x64
dist: sdist bdist_wheel
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
path: dist

- name: Publish to PyPI
uses: pypa/gh-action-pypi-publish@v1.2.2
uses: pypa/gh-action-pypi-publish@v1.5.0
with:
user: __token__
password: ${{ secrets.PYPI_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
fail-fast: true
matrix:
os: [ubuntu-latest]
python-version: [3.7]
python-version: ['3.10']
architecture: [x64]
runs-on: ${{ matrix.os }}
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ jobs:
fetch-depth: 0
persist-credentials: ${{ github.event_name != 'workflow_dispatch' }} # Allow using PAT when making release

- name: Set up Python 3.7
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.7
python-version: '3.10'
architecture: x64

- name: Set up environment
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: [3.7]
python-version: ['3.10']
architecture: [x64]
kivy-version: [2.0.0]
kivy-version: [2.1.0]
include:
- os: windows-latest
python-version: 3.7
python-version: '3.10'
architecture: x86
kivy-version: 2.0.0
kivy-version: 2.1.0
runs-on: ${{ matrix.os }}
env:
PYTHONUNBUFFERED: 1
Expand Down
7 changes: 6 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# Required
version: 2

# Set the version of Python and other tools you might need
build:
os: ubuntu-20.04
tools:
python: "3.10"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: docs/sources/conf.py
Expand All @@ -15,7 +21,6 @@ formats: all

# Optionally set the version of Python and requirements required to build your docs
python:
version: 3.7
install:
- method: pip
path: .
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ to save time. If you need full commit history, then remove `--depth 1`.
### How to use with [Buildozer](https://github.com/kivy/buildozer)

```ini
requirements = kivy==2.0.0, kivymd==0.104.2, sdl2_ttf == 2.0.15, pillow
requirements = kivy==2.1.0, kivymd==0.104.2, sdl2_ttf == 2.0.15, pillow
```

This will download latest release version of KivyMD from [PyPI](https://pypi.org/project/kivymd).
Expand All @@ -85,7 +85,7 @@ If you want to use development version from [master](https://github.com/kivymd/K
branch, you should specify link to zip archive:

```ini
requirements = kivy==2.0.0, https://github.com/kivymd/KivyMD/archive/master.zip
requirements = kivy==2.1.0, https://github.com/kivymd/KivyMD/archive/master.zip
```

---
Expand Down
2 changes: 1 addition & 1 deletion demos/crane/buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android.numeric_version = 1
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3,kivy==2.0.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
requirements = python3,kivy==2.1.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
5 changes: 4 additions & 1 deletion demos/fortnightly/.idea/fortnightly.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demos/fortnightly/buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android.numeric_version = 1
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3,kivy==2.0.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
requirements = python3,kivy==2.1.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
5 changes: 4 additions & 1 deletion demos/kitchen_sink/.idea/kitchen_sink.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demos/kitchen_sink/buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android.numeric_version = 1
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3,kivy==2.0.0,https://github.com/kivymd/KivyMD/archive/master.zip,pygments,sdl2_ttf==2.0.15,pillow
requirements = python3,kivy==2.1.0,https://github.com/kivymd/KivyMD/archive/master.zip,pygments,sdl2_ttf==2.0.15,pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
5 changes: 4 additions & 1 deletion demos/rally/.idea/rally.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demos/rally/buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android.numeric_version = 1
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3,kivy==2.0.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
requirements = python3,kivy==2.1.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
2 changes: 1 addition & 1 deletion demos/shrine/buildozer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ android.numeric_version = 1
# (list) Application requirements
# comma separated e.g. requirements = sqlite3,kivy
requirements = python3,kivy==2.0.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
requirements = python3,kivy==2.1.0,https://github.com/kivymd/KivyMD/archive/master.zip,sdl2_ttf==2.0.15,pillow
# (str) Custom source folders for requirements
# Sets custom source for any requirements with recipes
Expand Down
8 changes: 4 additions & 4 deletions kivymd/tools/patterns/create_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
- which the virtual environment will be created
- kivy_version
- version of Kivy (specify as `2.0.0` or `master`) that will be used in the project
- version of Kivy (specify as `2.1.0` or `master`) that will be used in the project
Optional arguments
------------------
Expand Down Expand Up @@ -276,7 +276,7 @@ def show_toast(self, interval: Union[int, float]) -> None:
self.dialog.auto_dismiss = True
"""

_firebase_requirements = """kivy==2.0.0
_firebase_requirements = """kivy==2.1.0
kivymd==1.0.0
multitasking
firebase
Expand All @@ -288,7 +288,7 @@ def show_toast(self, interval: Union[int, float]) -> None:
requests_toolbelt
"""

_without_firebase_requirements = """kivy==2.0.0
_without_firebase_requirements = """kivy==2.1.0
kivymd==1.0.0
"""

Expand Down Expand Up @@ -917,7 +917,7 @@ def create_argument_parser() -> ArgumentParserWithHelp:
)
parser.add_argument(
"kivy_version",
help="version of Kivy (specify as `2.0.0` or `master`) that will be "
help="version of Kivy (specify as `2.1.0` or `master`) that will be "
"used in the project.",
)
parser.add_argument(
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Format Python
[tool.black]
line-length = 80
target-version = ['py35', 'py36', 'py37', 'py38']
target-version = ['py36', 'py37', 'py38', 'py39', 'py310']
include = '(\.pyi?$|\.spec$)'
exclude = '''
(
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ classifiers = Development Status :: 4 - Beta
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
Operating System :: OS Independent
Operating System :: Android
Operating System :: POSIX :: Linux
Expand Down

0 comments on commit 180f344

Please sign in to comment.