From 40d4490ca93e89e6bc2b6f1a1a65604325bc690f Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Tue, 6 Dec 2022 19:20:28 +0000 Subject: [PATCH 1/2] Drop support for Python 3.6 as GitHub no longer supports it --- .github/workflows/run_tests_ci.yml | 2 +- .travis.yml | 6 ------ README.md | 4 ++-- setup.py | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml index f1b5c4a9..83252060 100644 --- a/.github/workflows/run_tests_ci.yml +++ b/.github/workflows/run_tests_ci.yml @@ -8,7 +8,7 @@ jobs: strategy: max-parallel: 4 matrix: - python-version: ['3.6', '3.7', '3.8', '3.9'] + python-version: ['3.7', '3.8', '3.9'] pygame-version: ['2.0.1', '2.1.0', '2.1.2'] steps: - uses: actions/checkout@v1 diff --git a/.travis.yml b/.travis.yml index 333ea2af..52346e93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,12 +54,6 @@ jobs: - python --version env: PYGAME_VERSION=2.0.0 - - os: linux - python: 3.6 - env: PYGAME_VERSION=2.0.1 - - os: linux - python: 3.6 - env: PYGAME_VERSION=2.1.0 - os: linux python: 3.7 env: PYGAME_VERSION=2.0.1 diff --git a/README.md b/README.md index 364a7a59..c49cfeba 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ A GUI system for pygame 2. - [Examples](https://github.com/MyreMylar/pygame_gui_examples) - [PyPi](https://pypi.org/project/pygame-gui/) -[![pypi](https://badge.fury.io/py/pygame-gui.svg)](https://pypi.python.org/pypi/pygame-gui) [![Documentation Status](https://readthedocs.org/projects/pygame-gui/badge/?version=latest)](https://pygame-gui.readthedocs.io/en/latest/?badge=latest) [![Python 3.6+](https://img.shields.io/badge/python-3.6+-blue.svg)](https://www.python.org/downloads/release/python-360/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Master](https://travis-ci.com/MyreMylar/pygame_gui.svg?branch=master)](https://travis-ci.com/MyreMylar/pygame_gui) [![codecov](https://codecov.io/gh/MyreMylar/pygame_gui/branch/main/graph/badge.svg?token=zZhkvhgTki)](https://codecov.io/gh/MyreMylar/pygame_gui) [![Downloads](https://pepy.tech/badge/pygame-gui)](https://pepy.tech/project/pygame-gui) +[![pypi](https://badge.fury.io/py/pygame-gui.svg)](https://pypi.python.org/pypi/pygame-gui) [![Documentation Status](https://readthedocs.org/projects/pygame-gui/badge/?version=latest)](https://pygame-gui.readthedocs.io/en/latest/?badge=latest) [![Python 3.7+](https://img.shields.io/badge/python-3.7+-blue.svg)](https://www.python.org/downloads/release/python-360/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT) [![Master](https://travis-ci.com/MyreMylar/pygame_gui.svg?branch=master)](https://travis-ci.com/MyreMylar/pygame_gui) [![codecov](https://codecov.io/gh/MyreMylar/pygame_gui/branch/main/graph/badge.svg?token=zZhkvhgTki)](https://codecov.io/gh/MyreMylar/pygame_gui) [![Downloads](https://pepy.tech/badge/pygame-gui)](https://pepy.tech/project/pygame-gui) ## Requirements - - Python 3.6+ + - Python 3.7+ - Pygame 2.0.1+ - python-i18n (does localization to different languages) diff --git a/setup.py b/setup.py index 8b92d21c..0c0d1b02 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ 'pygame_gui.data', 'pygame_gui.data.translations'], zip_safe=False, - python_requires='>=3.6', + python_requires='>=3.7', setup_requires=[], install_requires=['pygame>=2.0.1', 'python-i18n>=0.3.9', @@ -38,7 +38,6 @@ 'Intended Audience :: Developers', 'Topic :: Software Development :: Build Tools', 'License :: OSI Approved :: MIT License', - 'Programming Language :: Python :: 3.6', 'Programming Language :: Python :: 3.7', 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', From 9ddfccf1da149869c9b069770d9d0b3752045256 Mon Sep 17 00:00:00 2001 From: Dan Lawrence Date: Tue, 6 Dec 2022 22:07:51 +0000 Subject: [PATCH 2/2] change type hint set to Set --- pygame_gui/windows/ui_file_dialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pygame_gui/windows/ui_file_dialog.py b/pygame_gui/windows/ui_file_dialog.py index eaa9e475..f8590bf8 100644 --- a/pygame_gui/windows/ui_file_dialog.py +++ b/pygame_gui/windows/ui_file_dialog.py @@ -1,6 +1,6 @@ import warnings -from typing import Union, List, Optional +from typing import Union, List, Optional, Set from pathlib import Path import pygame @@ -38,7 +38,7 @@ def __init__(self, rect: pygame.Rect, manager: Optional[IUIManagerInterface], window_title: str = 'pygame-gui.file_dialog_title_bar', - allowed_suffixes: set[str] = {""}, + allowed_suffixes: Set[str] = {""}, initial_file_path: Optional[str] = None, object_id: Union[ObjectID, str] = ObjectID('#file_dialog', None), allow_existing_files_only: bool = False,