Merge pull request #225 from MyreMylar/version_060

Merge Version 0.6.0 branch

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,8 +24,8 @@ If applicable, add screenshots to help explain your problem.
 
 **Platform and software (please complete the following information):**
  - OS: [e.g. Windows, Linux, Mac]
- - Pygame GUI version [e.g. 0.4.0]
- - Pygame version [e.g. 1.9.6]
+ - Pygame GUI version [e.g. 0.6.0]
+ - Pygame version [e.g. 2.0.0, 2.1.0]
 
 **Additional context**
 Add any other context about the problem here.

.github/workflows/run_tests_ci.yml

@@ -8,12 +8,8 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.5, 3.6, 3.7]
-        pygame-version: [1.9.5, 1.9.6, 2.0.0.dev10]
-        exclude:
-          - {python-version: "3.6", pygame-version: "1.9.5"}
-          - {python-version: "3.7", pygame-version: "1.9.5"}
-
+        python-version: [3.6, 3.7, 3.8, 3.9]
+        pygame-version: [2.0.1, 2.1.0, 2.1.2]
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
@@ -25,7 +21,9 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install stringify
+        python -m pip install python-i18n
         python -m pip install pytest
+        python -m pip install pytest-benchmark
         python -m pip install pytest-cov
         python -m pip install codecov
         python -m pip install -q pygame==${{ matrix.pygame-version }}

.travis.yml

@@ -13,7 +13,7 @@ jobs:
   include:
     - os: osx
       language: generic
-      env: PYTHON=3.8.0 PYGAME_VERSION=2.0.0.dev10
+      env: PYTHON=3.8.0 PYGAME_VERSION=2.0.1
       before_install:
         - brew update
         - brew install openssl readline
@@ -27,7 +27,7 @@ jobs:
         - python --version
     - os: osx
       language: generic
-      env: PYTHON=3.7.5 PYGAME_VERSION=1.9.6
+      env: PYTHON=3.7.5 PYGAME_VERSION=2.1.0
       before_install:
         - brew update
         - brew install openssl readline
@@ -45,42 +45,47 @@ jobs:
         - choco install python3 --params "/InstallDir:C:\\Python"
         - export PATH="/c/Python:/c/Python/Scripts:$PATH"
         - python --version
-      env: PYGAME_VERSION=1.9.6
+      env: PYGAME_VERSION=2.1.0
     - os: windows
       language: shell
       before_install:
         - choco install python3 --params "/InstallDir:C:\\Python"
         - export PATH="/c/Python:/c/Python/Scripts:$PATH"
         - python --version
-      env: PYGAME_VERSION=2.0.0.dev10
-    - os: linux
-      python: 3.5
-      env: PYGAME_VERSION=1.9.6
-    - os: linux
-      python: 3.5
-      env: PYGAME_VERSION=2.0.0.dev10
+      env: PYGAME_VERSION=2.0.0
+
     - os: linux
       python: 3.6
-      env: PYGAME_VERSION=1.9.6
+      env: PYGAME_VERSION=2.0.1
     - os: linux
       python: 3.6
-      env: PYGAME_VERSION=2.0.0.dev10
+      env: PYGAME_VERSION=2.1.0
     - os: linux
       python: 3.7
-      env: PYGAME_VERSION=1.9.6
+      env: PYGAME_VERSION=2.0.1
     - os: linux
       python: 3.7
-      env: PYGAME_VERSION=2.0.0.dev10
-    # No Travis version of 1.9.6 on Python 3.8 yet
+      env: PYGAME_VERSION=2.1.0
     - os: linux
       python: 3.8
-      env: PYGAME_VERSION=2.0.0.dev10
+      env: PYGAME_VERSION=2.0.1
+    - os: linux
+      python: 3.8
+      env: PYGAME_VERSION=2.1.0
+    - os: linux
+      python: 3.9
+      env: PYGAME_VERSION=2.0.1
+    - os: linux
+      python: 3.10
+      env: PYGAME_VERSION=2.1.2
 
 install:
   - python -m pip install -U pip
   - python -m pip install pytest
   - python -m pip install pytest-cov
+  - python -m pip install pytest-benchmark
   - python -m pip install codecov
+  - python -m pip install python-i18n
   - python -m pip install -q pygame==$PYGAME_VERSION
   - python setup.py -q install
 

CONTRIBUTING.md

@@ -19,10 +19,6 @@ Building the library
 
 Building Pygame GUI as a developer has a few additional dependecies.
 
-For building the library you will need:
-
-  - stringify
-
 For building the documentation you will need:
 
   - sphinx

MANIFEST.in

@@ -1,4 +1,6 @@
 include pygame_gui/data/licenses/*.txt
 include pygame_gui/data/*.txt
 include pygame_gui/data/*.ttf
-include pygame_gui/data/*.json
+include pygame_gui/data/*.otf
+include pygame_gui/data/*.json
+include pygame_gui/data/translations/*.json

README.md

@@ -1,7 +1,7 @@
 
 
 # Pygame GUI
-A GUI system for pygame 2 (it also works OK on pygame 1.9).
+A GUI system for pygame 2.
 
  - [Documentation](https://pygame-gui.readthedocs.io/en/latest/index.html)
  - [GitHub](https://github.com/MyreMylar/pygame_gui)
@@ -11,8 +11,9 @@ A GUI system for pygame 2 (it also works OK on pygame 1.9).
 [![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.5+](https://img.shields.io/badge/python-3.5+-blue.svg)](https://www.python.org/downloads/release/python-350/) [![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) [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/MyreMylar/pygame_gui.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MyreMylar/pygame_gui/context:python) [![Total alerts](https://img.shields.io/lgtm/alerts/g/MyreMylar/pygame_gui.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/MyreMylar/pygame_gui/alerts/) [![codecov](https://codecov.io/gh/MyreMylar/pygame_gui/branch/master/graph/badge.svg)](https://codecov.io/gh/MyreMylar/pygame_gui) [![Downloads](https://pepy.tech/badge/pygame-gui)](https://pepy.tech/project/pygame-gui)
 ## Requirements
 
- - Python 3.5+
- - Pygame
+ - Python 3.6+
+ - Pygame 2.0.1+
+ - python-i18n (does localization to different languages)
 
 ## How to install