v1.1.319a25

* Fixed bug with goopylib installing incorrectly using pip

Author: Bhavye Mathur

.gitignore

@@ -1,6 +1,5 @@
 .idea/
 .vs/
-dist/
 build/
 **/goopylib.egg-info/
 *.log

MANIFEST.in

@@ -1 +1,4 @@
-graft goopylib*
+graft goopylib
+global-include *.pyd
+global-include *.so
+recursive-include goopylib *.pyd

README.md

@@ -177,6 +177,10 @@ https://stackoverflow.com/questions/63978464/error-when-compiling-cpython-cannot
 There are probably still a lot of bugs in the release version, but I moved onto Version 1.1 because I started working 
 on converting goopylib code to Cython & C and also building a Sound Engine for goopylib 1.2
 
+#### 1.1.319-alpha25 27th May 2021 - 24,385 lines of code
+
+* Fixed bug with goopylib installing incorrectly using pip
+
 #### 1.1.318-alpha25 5th May - 25th May 2021 - 25,061 lines of code
 
 * Fixed bug with the `Rectangle` class's `copy()` function not creating a copy of the position lists and just creating a 

dist/goopylib-1.1.319a1-py3-none-any.whl

@@ -8,7 +8,7 @@
 from goopylib.Window import Window
 
 __all__ = ['Window', 'util', 'styles', 'constants', 'colours']
-__version__ = "1.1.318a25"
+__version__ = "1.1.319a25"
 
 from platform import system as platform_system
 if platform_system() == "Windows":

dist/goopylib-1.1.319a1.tar.gz

@@ -9,34 +9,9 @@
 
 Tested on Python 3.7.9 (Windows) and Python 3.8.6 (MacOSX)
 
-pip install twine
 pip install --upgrade setuptools
-
 pip install build
 
-CREATING RELEASES-------------------------------------------------------------------------------------------------------
-    - Update README.md version number
-    - Update setup.cfg version number
-    - Update goopylib/__init__.py __version__ variable
-    - Run setup_extensions.py and build goopylib .pyd C extensions
-    - Test all Example python files, run goopylib_tests.py and test functions on Windows
-    - Run goopylib_tests.py countlines() function and update README.md with line count
-    - Push to GitHub, pull from MacOS computer
-    - Run setup_extensions.py and build goopylib .so C extensions
-    - Test all Example python files, run goopylib_tests.py and test functions on MacOS
-    - Push files to GitHub
-    - Create GitHub Release
-    - Build goopylib Release
-    - Upload goopylib Release on PyPi
-    - Test goopylib installation on Windows
-    - Test goopylib installation on MacOS
-    
-    To create release: python setup_extensions.py sdist bdist_wheel
-    sdist bdist_wheel
-
-    To check release: twine check dist/*
-    To upload release: twine upload dist/*
-
 BUILDING EXTENSIONS-----------------------------------------------------------------------------------------------------
     To build Extension: python setup_extensions.py build -c mingw32
     build -c mingw32

goopylib/__init__.py

@@ -14,11 +14,12 @@ def countlines(start, lines=0, _header=True, _begin_start=None):
         file = os.path.join(start, file)
         if os.path.isfile(file):
             if any(file.endswith(end) for end in (".py", ".c", ".h", ".cfg", ".toml", ".in")):
-                with open(file, 'r') as f:
-                    newlines = len(f.readlines())
-                    lines += newlines
+                if not any(folder in file for folder in ("build", "Examples")):
+                    with open(file, 'r') as f:
+                        newlines = len(f.readlines())
+                        lines += newlines
 
-                    print('{:>10} |{:>10} | {}'.format(newlines, lines, file))
+                        print('{:>10} |{:>10} | {}'.format(newlines, lines, file))
 
     for file in os.listdir(start):
         file = os.path.join(start, file)
@@ -741,7 +742,7 @@ def test_all_examples():
     print()
 """
 
-test_all_functions()
-test_all_examples()
+# test_all_functions()
+# test_all_examples()
 
-# countlines(".")
+countlines(".")

goopylib/setup_extensions.py

@@ -1,15 +1,20 @@
 [metadata]
 name = goopylib
-version = 1.1.318a25
+version = 1.1.319a1
 author = Bhavye Mathur
 author_email = bhavyemathur@gmail.com
 
+maintainer = Bhavye Mathur
+maintainer_email = bhavyemathur@gmail.com
+
 description = A simple-yet-powerful 2D graphics framework built on top of Tkinter capable of creating good-looking, modern GUIs, games, and animations.
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/BhavyeMathur/goopylib
 
-download_url = https://github.com/BhavyeMathur/goopylib/archive/v1.1.282-alpha.tar.gz
+license = MIT License
+
+download_url = https://github.com/BhavyeMathur/goopylib/archive/v1.1.318-alpha.tar.gz
 project_urls =
     Bug Tracker = https://github.com/BhavyeMathur/goopylib/issues
     Documentation = https://github.com/BhavyeMathur/goopylib/wiki
@@ -32,16 +37,18 @@ key_words =
     2D Graphics
     Python GUI
     Game Creator
-    Graphics Library'
+    Graphics Library
 
 [options]
 package_dir =
-    = goopylib
+    = .
 packages = find:
 python_requires = >=3.6
 
+include_package_data = True
+
 install_requires =
     pillow
 
 [options.packages.find]
-where = goopylib
+where = .

goopylib_tests.py

@@ -0,0 +1,50 @@
+from setuptools import setup
+
+"""
+pip install twine
+pip install build
+
+CREATING RELEASES-------------------------------------------------------------------------------------------------------
+    - Update README.md version number
+    - Update setup.cfg version number
+    - Update goopylib/__init__.py __version__ variable
+    - Run setup_extensions.py and build goopylib .pyd C extensions
+    - Test all Example python files, run goopylib_tests.py and test functions on Windows
+    - Run goopylib_tests.py countlines() function and update README.md with line count
+    - Push to GitHub, pull from MacOS computer
+    - Run setup_extensions.py and build goopylib .so C extensions
+    - Test all Example python files, run goopylib_tests.py and test functions on MacOS
+    - Push files to GitHub
+    - Create GitHub Release
+    - Update download_url in setup.cfg
+    - Build goopylib Release
+    - Upload goopylib Release on TestPyPi
+    - Install and check from TestPyPi
+    - Upload goopylib Release on PyPi
+    - Test goopylib installation on Windows
+    - Test goopylib installation on MacOS
+    
+    To create source distribution: 
+        1. python -m build --sdist
+        2. python setup.py sdist
+        
+    To create (platform) wheel: 
+        1. python -m build --wheel
+        2. python setup.py bdist_wheel
+    
+    To create release (wheel and source distribution):
+        1. python -m build
+        2. python setup.py sdist bdist_wheel
+
+    To check release: twine check dist/*
+    To upload test release: twine upload --repository testpypi dist/*
+    To install test release: pip install -i https://test.pypi.org/simple/ goopylib==version
+    
+    To upload release: twine upload dist/*
+    To install release: pip install goopylib==version
+    
+    Username: BhavyeMathur
+"""
+
+setup(package_dir={':maths': 'goopylib/maths', ":objects": 'goopylib/objects', ":applications": 'goopylib/applications',
+                   ":sound": 'goopylib/sound', ":physics": 'goopylib/physics'})