Merge branch 'main' into 0.7.0

MyreMylar · Apr 6, 2023 · fdb2a97 · fdb2a97
2 parents 48ab523 + d18bb6d
commit fdb2a97
Show file tree

Hide file tree

Showing 57 changed files with 902 additions and 978 deletions.
diff --git a/.github/workflows/run_tests_ci.yml b/.github/workflows/run_tests_ci.yml
@@ -2,21 +2,21 @@ name: Run Tests
 on: [push]
 
 jobs:
-  build-on-linux-old:
+  build-on-linux:
 
     runs-on: ubuntu-latest
     strategy:
       max-parallel: 4
       matrix:
-        python-version: ['3.7', '3.8', '3.9']
-        pygame-version: ['2.0.1', '2.1.0', '2.1.2']
+        python-version: ['3.8', '3.9', '3.10', '3.11']
+        pygame-ce-version: ['2.1.4', '2.2.1']
     steps:
     - uses: actions/checkout@v1
     - name: Set up Python ${{ matrix.python-version }}
       uses: actions/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
-        pygame-version: ${{ matrix.pygame-version }}
+        pygame-ce-version: ${{ matrix.pygame-ce-version }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -26,7 +26,7 @@ jobs:
         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 }}
+        python -m pip install -q pygame-ce==${{ matrix.pygame-ce-version }}
         python -m pip install . -U
         sudo apt-get install xvfb
         sudo apt-get install xclip
@@ -42,61 +42,21 @@ jobs:
       with:
         token: ${{ secrets.CODECOV_TOKEN }} #required
 
-  build-on-linux-new:
-
-    runs-on: ubuntu-latest
-    strategy:
-      max-parallel: 4
-      matrix:
-        python-version: [ '3.10', '3.11']
-        pygame-version: [ '2.1.3.dev8' ]
-    steps:
-      - uses: actions/checkout@v1
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
-        with:
-          python-version: ${{ matrix.python-version }}
-          pygame-version: ${{ matrix.pygame-version }}
-      - name: Install dependencies
-        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 }}
-          python -m pip install . -U
-          sudo apt-get install xvfb
-          sudo apt-get install xclip
-          sudo apt-get install xsel
-      - name: Test with pytest
-        env:
-          SDL_VIDEODRIVER: dummy
-          SDL_AUDIODRIVER: disk
-        run: |
-          xvfb-run pytest --cov-report=xml --cov=pygame_gui tests/
-      - name: Upload to Code Cov
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{ secrets.CODECOV_TOKEN }} #required
-
   build-on-windows:
 
     runs-on: windows-latest
     strategy:
       max-parallel: 4
       matrix:
         python-version: [ '3.11' ]
-        pygame-version: [ '2.1.3.dev8' ]
+        pygame-ce-version: [ '2.1.4', '2.2.1' ]
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-          pygame-version: ${{ matrix.pygame-version }}
+          pygame-ce-version: ${{ matrix.pygame-ce-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -106,7 +66,7 @@ jobs:
           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 }}
+          python -m pip install -q pygame-ce==${{ matrix.pygame-ce-version }}
           python -m pip install . -U
       - name: Test with pytest
         env:
@@ -125,15 +85,15 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [ '3.10' ]
-        pygame-version: [ '2.1.2' ]
+        python-version: [ '3.11' ]
+        pygame-ce-version: [ '2.1.4', '2.2.1' ]
     steps:
       - uses: actions/checkout@v1
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v1
         with:
           python-version: ${{ matrix.python-version }}
-          pygame-version: ${{ matrix.pygame-version }}
+          pygame-ce-version: ${{ matrix.pygame-ce-version }}
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -143,7 +103,7 @@ jobs:
           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 }}
+          python -m pip install -q pygame-ce==${{ matrix.pygame-ce-version }}
           python -m pip install . -U
       - name: Test with pytest
         env:

diff --git a/.travis.yml b/.travis.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 Contributing to Pygame GUI
 --------------------------
 
-Basic guidlines for contributing
+Basic guidelines for contributing
 ================================
 
 1. **Pygame GUI uses PEP8 as a style guide**, mainly because it is enforced by PyCharm. Contributions should be in the same general style.
@@ -38,7 +38,7 @@ All should be pip installable.
 Venv:
 + If developing a [virtual environment](https://docs.python.org/3/library/venv.html) (recommended), use this command while in the environment to download all relevant dependencies
 + ```python -m pip install pygame python-i18n importlib_resources typing_extensions```
-+ Or here's a one liner to set up the virtual environment all at once
++ Or here's a one-liner to set up the virtual environment all at once
 + ```python -m pip install pygame python-i18n importlib_resources typing_extensions sphinx sphinx_rtd_theme pytest pytest-cov pytest-benchmark ```
 
  Helpful checklist to go through before submitting a big pull request

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ A GUI system for pygame CE.
 ## Requirements
 
  - Python 3.7+
- - Pygame Community Edition 2.1.3+
+ - Pygame Community Edition 2.1.4+
  - python-i18n (does localization to different languages)
 
 ## How to install

diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,3 +1,4 @@
 pygame-ce
 python-i18n
-importlib_resources
+importlib_resources
+typing_extensions
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -21,10 +21,10 @@
 sys.path.insert(0, os.path.abspath('../../pygame_gui/'))
 sys.path.insert(0, os.path.abspath('../../pygame_gui/windows/'))
 sys.path.insert(0, os.path.abspath('../../pygame_gui/elements/'))
-sys.path.insert(0, os.path.abspath('../../pygame_gui/elements/text/'))
 sys.path.insert(0, os.path.abspath('../../pygame_gui/core/'))
 sys.path.insert(0, os.path.abspath('../../pygame_gui/core/drawable_shapes/'))
 sys.path.insert(0, os.path.abspath('../../pygame_gui/core/interfaces/'))
+sys.path.insert(0, os.path.abspath('../../pygame_gui/core/text/'))
 
 
 # -- Project information -----------------------------------------------------
@@ -72,7 +72,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -102,96 +102,16 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
 
-# Custom sidebar templates, must be a dictionary that maps document names
-# to template names.
-#
-# The default sidebars (for documents that don't match any pattern) are
-# defined by theme itself.  Builtin themes are using these templates by
-# default: ``['localtoc.html', 'relations.html', 'sourcelink.html',
-# 'searchbox.html']``.
-#
-# html_sidebars = {}
-
 
 # -- Options for HTMLHelp output ---------------------------------------------
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'pygame_gui_doc'
-
 smartquotes = False
-# -- Options for LaTeX output ------------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    #
-    # 'papersize': 'letterpaper',
-
-    # The font size ('10pt', '11pt' or '12pt').
-    #
-    # 'pointsize': '10pt',
-
-    # Additional stuff for the LaTeX preamble.
-    #
-    # 'preamble': '',
-
-    # Latex figure (float) alignment
-    #
-    # 'figure_align': 'htbp',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-# latex_documents = []
-
-
-# -- Options for manual page output ------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'an_example_pypi_project', 'an_example_pypi_project Documentation',
-     [author], 1)
-]
-
-
-# -- Options for Texinfo output ----------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (master_doc, 'an_example_pypi_project', 'an_example_pypi_project Documentation',
-     author, 'an_example_pypi_project', 'One line description of project.',
-     'Miscellaneous'),
-]
-
-
-# -- Options for Epub output -------------------------------------------------
-
-# Bibliographic Dublin Core info.
-epub_title = project
-
-# The unique identifier of the text. This can be a ISBN number
-# or the project homepage.
-#
-# epub_identifier = ''
-
-# A unique identification for the text.
-#
-# epub_uid = ''
-
-# A list of files that should not be packed into the epub file.
-epub_exclude_files = ['search.html']
-
-
-# -- Extension configuration -------------------------------------------------
 
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python': ('https://docs.python.org/3', None),
-                       'pygame-ce': ('https://pyga.me/docs/', None),
-                       'pygame': ('https://pyga.me/docs/', None)}
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None)}
 
 autodoc_mock_imports = ["ctypes"]