Revert "Merge branch 'pygame-ce' into master"

This reverts commit 23f66ff, reversing
changes made to 8a7b680.

Author: ppizarror

.github/workflows/ci.yml

@@ -7,10 +7,10 @@ concurrency:
 on:
   push:
     branches:
-      - pygame-ce
+      - master
   pull_request:
     branches:
-      - pygame-ce
+      - master
 
 jobs:
   test:

README.rst

@@ -1,6 +1,6 @@
-==============
-pygame-menu-ce
-==============
+===========
+pygame-menu
+===========
 
 .. image:: docs/_static/pygame_menu_small.png
     :align: center
@@ -18,6 +18,10 @@ pygame-menu-ce
     :target: https://www.python.org/downloads
     :alt: Python 3.8+
 
+.. image:: https://img.shields.io/badge/pygame-1.9.3%2B%2F2.0%2B-orange
+    :target: https://www.pygame.org
+    :alt: Pygame 1.9.3+/2.0+
+
 .. image:: https://badge.fury.io/py/pygame-menu.svg
     :target: https://pypi.org/project/pygame-menu
     :alt: PyPi package
@@ -61,23 +65,25 @@ and run it on `Repl.it <https://repl.it/github/ppizarror/pygame-menu>`_
 Introduction
 ------------
 
-Pygame-menu-ce is a `python-pygame-ce <https://pyga.me>`_ library for creating menus and GUIs.
+Pygame-menu is a `python-pygame <https://www.pygame.org>`_ library for creating menus and GUIs.
 It supports several widgets, such as buttons, color inputs, clock objects, drop selectors,
 frames, images, labels, selectors, tables, text inputs, color switches, and many
 more, with multiple customization options.
 
 Comprehensive documentation for the latest version is available at
 https://pygame-menu.readthedocs.io
 
+**Note**: For `pygame-ce`, check out `pygame-menu-ce <https://github.com/ppizarror/pygame-menu/tree/pygame-ce>`_.
+
 
 Install Instructions
 --------------------
 
-Pygame-menu-ce can be installed via pip. Simply run:
+Pygame-menu can be installed via pip. Simply run:
 
 .. code-block:: bash
 
-    $> pip install pygame-menu-ce -U
+    $> pip install pygame-menu -U
 
 To build the documentation from a Git repository:
 

pygame_menu/__init__.py

@@ -3,7 +3,7 @@
 https://github.com/ppizarror/pygame-menu
 
 PYGAME-MENU
-A menu for pygame-ce. Simple, and easy to use.
+A menu for pygame. Simple, and easy to use.
 """
 
 __all__ = [
@@ -120,11 +120,11 @@
 
 ]
 __copyright__ = 'Copyright 2017 Pablo Pizarro R. @ppizarror'
-__description__ = 'A menu for pygame-ce. Simple, and easy to use'
+__description__ = 'A menu for pygame. Simple, and easy to use'
 __email__ = '[email protected]'
 __keywords__ = 'pygame menu menus gui widget input button pygame-menu image sound ui'
 __license__ = 'MIT'
-__module_name__ = 'pygame-menu-ce'
+__module_name__ = 'pygame-menu'
 __url__ = 'https://pygame-menu.readthedocs.io'
 __url_bug_tracker__ = 'https://github.com/ppizarror/pygame-menu/issues'
 __url_documentation__ = 'https://pygame-menu.readthedocs.io'

requirements.txt

@@ -1,3 +1,3 @@
-pygame-ce>=2.2.0
+pygame>=1.9.3
 pyperclip
 typing_extensions

setup.py

@@ -1,5 +1,5 @@
 """
-pygame-menu-ce
+pygame-menu
 https://github.com/ppizarror/pygame-menu
 
 SETUP DISTRIBUTION

test/test_baseimage.py

@@ -281,7 +281,7 @@ def test_invalid_image(self) -> None:
         Test invalid image opening.
         """
         image = pygame_menu.BaseImage(pygame_menu.baseimage.IMAGE_EXAMPLE_PYTHON)
-        # self.assertEqual(image.get_size(), (110, 109)) Disabled for ce-mode
+        self.assertEqual(image.get_size(), (110, 109))
 
         image._drawing_position = 'invalid'
         self.assertRaises(ValueError, lambda: image._get_position_delta())