WARNING: This commit restructures the source tree. Support both PyPy …

…and Cython in setup.py (#94) * First few changes * PyPy and Cython co-exists in setup.py. Restructured directories for pip and add 'pyboy' command line access * Cleaned up root dir * Improvements to tests * Updated setup.py details for PyPi * Ready for PyPi * Ready for action! * Improved coverage report and added more features to Makefile and setup.py * Fixed issue with selecting Cython
Baekalfen · Dec 23, 2019 · 1ddd381 · 1ddd381
1 parent ae7af62
commit 1ddd381
Show file tree

Hide file tree

Showing 95 changed files with 190 additions and 188 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -0,0 +1,5 @@
+[report]
+omit=
+    tests/*.py,
+    generator.py,
+    setup.py,
diff --git a/.gitignore b/.gitignore
@@ -91,21 +91,21 @@ tmp.state
 *.gb*.ram
 *.gb*.rtc
 
-Source/pyboy/**/*.c
-Source/pyboy/**/*.h
-Source/pyboy/**/*.html
-Source/pyboy/**/*.so
+/pyboy/**/*.c
+/pyboy/**/*.h
+/pyboy/**/*.html
+/pyboy/**/*.so
 
-/Source/recordings
+/recordings
 
 # Files from venv and dependencies
-/Source/bin
-/Source/include
-/Source/lib-python
-/Source/lib_pypy
-/Source/pip-selfcheck.json
-/Source/site-packages
-/Source/share
+/bin
+/include
+/lib-python
+/lib_pypy
+/pip-selfcheck.json
+/site-packages
+/share
 
 /bin
 /include

diff --git a/Source/Makefile → Makefile b/Source/Makefile → Makefile
@@ -10,11 +10,19 @@ else
     CFLAGS='-w -DCYTHON_WITHOUT_ASSERTIONS'
 endif
 
-THREADS := 6
 PY := python3
 PYPY := pypy3
 ROOT_DIR := $(shell git rev-parse --show-toplevel)
 
+dist: clean build
+	${PY} setup.py sdist bdist_wheel
+	${PY} -m twine upload dist/pyboy-${version}*
+
+codecov: clean
+	@echo "Finding code coverage..."
+	CFLAGS='-w -DCYTHON_TRACE=1' ${PY} setup.py build_ext --inplace --codecov-trace
+	${PY} setup.py test --codecov-trace
+
 build:
 	@echo "Building..."
 	CFLAGS=$(CFLAGS) ${PY} setup.py build_ext --inplace
@@ -27,15 +35,11 @@ install:
 	CFLAGS=$(CFLAGS) ${PY} setup.py install build_ext
 
 test: clean build
-	${PY} tetris_bot.py ${ROOT_DIR}/Source/ROMs/Tetris.gb --quiet
-	${PY} interface_example.py --quiet
-	${PY} -m pytest -n${THREADS} -v
-	${PYPY} tetris_bot.py ${ROOT_DIR}/Source/ROMs/Tetris.gb --quiet
-	${PYPY} interface_example.py --quiet
-	${PYPY} -m pytest -n${THREADS} -v
+	${PY} setup.py test
+	${PYPY} setup.py test
 
 test_quick: clean build
-	${PY} -m pytest -n${THREADS} -v
+	${PY} setup.py test
 
 docs: clean
 	pdoc --html --force pyboy

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-<img src="README/pyboy.svg" width="480">
+<img src="https://github.com/Baekalfen/PyBoy/raw/master/README/pyboy.svg" width="480">
 </p>
 
 __If you have any questions, or just want to chat, [join us on Discord](https://discord.gg/Zrf2nyH).__

diff --git a/Source/blargg.md b/Source/blargg.md
diff --git a/Source/requirements.txt b/Source/requirements.txt
diff --git a/Source/requirements_all.txt b/Source/requirements_all.txt
diff --git a/Source/interface_example.py → examples/interface_example.py b/Source/interface_example.py → examples/interface_example.py
diff --git a/Source/tetris_bot.py → examples/tetris_bot.py b/Source/tetris_bot.py → examples/tetris_bot.py
diff --git a/Source/pyboy/__init__.py → pyboy/__init__.py b/Source/pyboy/__init__.py → pyboy/__init__.py
diff --git a/Source/main.py → pyboy/__main__.py b/Source/main.py → pyboy/__main__.py
diff --git a/Source/pyboy/botsupport/__init__.py → pyboy/botsupport/__init__.py b/Source/pyboy/botsupport/__init__.py → pyboy/botsupport/__init__.py
diff --git a/Source/pyboy/botsupport/constants.py → pyboy/botsupport/constants.py b/Source/pyboy/botsupport/constants.py → pyboy/botsupport/constants.py
diff --git a/Source/pyboy/botsupport/sprite.py → pyboy/botsupport/sprite.py b/Source/pyboy/botsupport/sprite.py → pyboy/botsupport/sprite.py
diff --git a/Source/pyboy/botsupport/spritetracker.py → pyboy/botsupport/spritetracker.py b/Source/pyboy/botsupport/spritetracker.py → pyboy/botsupport/spritetracker.py
diff --git a/Source/pyboy/botsupport/tile.pxd → pyboy/botsupport/tile.pxd b/Source/pyboy/botsupport/tile.pxd → pyboy/botsupport/tile.pxd
diff --git a/Source/pyboy/botsupport/tile.py → pyboy/botsupport/tile.py b/Source/pyboy/botsupport/tile.py → pyboy/botsupport/tile.py
diff --git a/Source/pyboy/botsupport/tilemap.py → pyboy/botsupport/tilemap.py b/Source/pyboy/botsupport/tilemap.py → pyboy/botsupport/tilemap.py
diff --git a/Source/pyboy/core/__init__.py → pyboy/core/__init__.py b/Source/pyboy/core/__init__.py → pyboy/core/__init__.py
diff --git a/Source/pyboy/core/bootrom.pxd → pyboy/core/bootrom.pxd b/Source/pyboy/core/bootrom.pxd → pyboy/core/bootrom.pxd
diff --git a/Source/pyboy/core/bootrom.py → pyboy/core/bootrom.py b/Source/pyboy/core/bootrom.py → pyboy/core/bootrom.py
diff --git a/Source/pyboy/core/cartridge/__init__.py → pyboy/core/cartridge/__init__.py b/Source/pyboy/core/cartridge/__init__.py → pyboy/core/cartridge/__init__.py
diff --git a/Source/pyboy/core/cartridge/base_mbc.pxd → pyboy/core/cartridge/base_mbc.pxd b/Source/pyboy/core/cartridge/base_mbc.pxd → pyboy/core/cartridge/base_mbc.pxd
diff --git a/Source/pyboy/core/cartridge/base_mbc.py → pyboy/core/cartridge/base_mbc.py b/Source/pyboy/core/cartridge/base_mbc.py → pyboy/core/cartridge/base_mbc.py
diff --git a/Source/pyboy/core/cartridge/cartridge.pxd → pyboy/core/cartridge/cartridge.pxd b/Source/pyboy/core/cartridge/cartridge.pxd → pyboy/core/cartridge/cartridge.pxd
diff --git a/Source/pyboy/core/cartridge/cartridge.py → pyboy/core/cartridge/cartridge.py b/Source/pyboy/core/cartridge/cartridge.py → pyboy/core/cartridge/cartridge.py
diff --git a/Source/pyboy/core/cartridge/mbc1.pxd → pyboy/core/cartridge/mbc1.pxd b/Source/pyboy/core/cartridge/mbc1.pxd → pyboy/core/cartridge/mbc1.pxd
diff --git a/Source/pyboy/core/cartridge/mbc1.py → pyboy/core/cartridge/mbc1.py b/Source/pyboy/core/cartridge/mbc1.py → pyboy/core/cartridge/mbc1.py
diff --git a/Source/pyboy/core/cartridge/mbc2.pxd → pyboy/core/cartridge/mbc2.pxd b/Source/pyboy/core/cartridge/mbc2.pxd → pyboy/core/cartridge/mbc2.pxd
diff --git a/Source/pyboy/core/cartridge/mbc2.py → pyboy/core/cartridge/mbc2.py b/Source/pyboy/core/cartridge/mbc2.py → pyboy/core/cartridge/mbc2.py
diff --git a/Source/pyboy/core/cartridge/mbc3.pxd → pyboy/core/cartridge/mbc3.pxd b/Source/pyboy/core/cartridge/mbc3.pxd → pyboy/core/cartridge/mbc3.pxd
diff --git a/Source/pyboy/core/cartridge/mbc3.py → pyboy/core/cartridge/mbc3.py b/Source/pyboy/core/cartridge/mbc3.py → pyboy/core/cartridge/mbc3.py
diff --git a/Source/pyboy/core/cartridge/mbc5.pxd → pyboy/core/cartridge/mbc5.pxd b/Source/pyboy/core/cartridge/mbc5.pxd → pyboy/core/cartridge/mbc5.pxd
diff --git a/Source/pyboy/core/cartridge/mbc5.py → pyboy/core/cartridge/mbc5.py b/Source/pyboy/core/cartridge/mbc5.py → pyboy/core/cartridge/mbc5.py
diff --git a/Source/pyboy/core/cartridge/rtc.pxd → pyboy/core/cartridge/rtc.pxd b/Source/pyboy/core/cartridge/rtc.pxd → pyboy/core/cartridge/rtc.pxd
diff --git a/Source/pyboy/core/cartridge/rtc.py → pyboy/core/cartridge/rtc.py b/Source/pyboy/core/cartridge/rtc.py → pyboy/core/cartridge/rtc.py
diff --git a/Source/pyboy/core/cpu.pxd → pyboy/core/cpu.pxd b/Source/pyboy/core/cpu.pxd → pyboy/core/cpu.pxd
diff --git a/Source/pyboy/core/cpu.py → pyboy/core/cpu.py b/Source/pyboy/core/cpu.py → pyboy/core/cpu.py
diff --git a/Source/pyboy/core/generator.py → pyboy/core/generator.py b/Source/pyboy/core/generator.py → pyboy/core/generator.py
diff --git a/Source/pyboy/core/interaction.pxd → pyboy/core/interaction.pxd b/Source/pyboy/core/interaction.pxd → pyboy/core/interaction.pxd
diff --git a/Source/pyboy/core/interaction.py → pyboy/core/interaction.py b/Source/pyboy/core/interaction.py → pyboy/core/interaction.py
diff --git a/Source/pyboy/core/lcd.pxd → pyboy/core/lcd.pxd b/Source/pyboy/core/lcd.pxd → pyboy/core/lcd.pxd
diff --git a/Source/pyboy/core/lcd.py → pyboy/core/lcd.py b/Source/pyboy/core/lcd.py → pyboy/core/lcd.py
diff --git a/Source/pyboy/core/mb.pxd → pyboy/core/mb.pxd b/Source/pyboy/core/mb.pxd → pyboy/core/mb.pxd
diff --git a/Source/pyboy/core/mb.py → pyboy/core/mb.py b/Source/pyboy/core/mb.py → pyboy/core/mb.py
diff --git a/Source/pyboy/core/opcodes.pxd → pyboy/core/opcodes.pxd b/Source/pyboy/core/opcodes.pxd → pyboy/core/opcodes.pxd
diff --git a/Source/pyboy/core/opcodes.py → pyboy/core/opcodes.py b/Source/pyboy/core/opcodes.py → pyboy/core/opcodes.py
diff --git a/Source/pyboy/core/ram.pxd → pyboy/core/ram.pxd b/Source/pyboy/core/ram.pxd → pyboy/core/ram.pxd
diff --git a/Source/pyboy/core/ram.py → pyboy/core/ram.py b/Source/pyboy/core/ram.py → pyboy/core/ram.py
diff --git a/Source/pyboy/core/timer.pxd → pyboy/core/timer.pxd b/Source/pyboy/core/timer.pxd → pyboy/core/timer.pxd
diff --git a/Source/pyboy/core/timer.py → pyboy/core/timer.py b/Source/pyboy/core/timer.py → pyboy/core/timer.py
diff --git a/Source/pyboy/logger.py → pyboy/logger.py b/Source/pyboy/logger.py → pyboy/logger.py
diff --git a/Source/pyboy/pyboy.pxd → pyboy/pyboy.pxd b/Source/pyboy/pyboy.pxd → pyboy/pyboy.pxd
diff --git a/Source/pyboy/pyboy.py → pyboy/pyboy.py b/Source/pyboy/pyboy.py → pyboy/pyboy.py
diff --git a/Source/pyboy/rewind.pxd → pyboy/rewind.pxd b/Source/pyboy/rewind.pxd → pyboy/rewind.pxd
diff --git a/Source/pyboy/rewind.py → pyboy/rewind.py b/Source/pyboy/rewind.py → pyboy/rewind.py
diff --git a/Source/pyboy/screenrecorder.py → pyboy/screenrecorder.py b/Source/pyboy/screenrecorder.py → pyboy/screenrecorder.py
diff --git a/Source/pyboy/window/__init__.py → pyboy/window/__init__.py b/Source/pyboy/window/__init__.py → pyboy/window/__init__.py
@@ -4,7 +4,7 @@
 #
 
 # Import sdl2 so Windows has SDL2.dll in memory
-import sdl2 # NOQA:F401
+import sdl2  # NOQA:F401
 
-from .base_window import BaseWindow # NOQA:F401
-from .window import getwindow # NOQA:F401
+from .base_window import BaseWindow  # NOQA:F401
+from .window import getwindow  # NOQA:F401
diff --git a/Source/pyboy/window/base_window.pxd → pyboy/window/base_window.pxd b/Source/pyboy/window/base_window.pxd → pyboy/window/base_window.pxd
diff --git a/Source/pyboy/window/base_window.py → pyboy/window/base_window.py b/Source/pyboy/window/base_window.py → pyboy/window/base_window.py
diff --git a/Source/pyboy/window/debug_window.pxd → pyboy/window/debug_window.pxd b/Source/pyboy/window/debug_window.pxd → pyboy/window/debug_window.pxd
diff --git a/Source/pyboy/window/debug_window.py → pyboy/window/debug_window.py b/Source/pyboy/window/debug_window.py → pyboy/window/debug_window.py
diff --git a/Source/pyboy/window/sdl2.pxd → pyboy/window/sdl2.pxd b/Source/pyboy/window/sdl2.pxd → pyboy/window/sdl2.pxd
diff --git a/Source/pyboy/window/window.pxd → pyboy/window/window.pxd b/Source/pyboy/window/window.pxd → pyboy/window/window.pxd
diff --git a/Source/pyboy/window/window.py → pyboy/window/window.py b/Source/pyboy/window/window.py → pyboy/window/window.py
diff --git a/Source/pyboy/window/window_dummy.pxd → pyboy/window/window_dummy.pxd b/Source/pyboy/window/window_dummy.pxd → pyboy/window/window_dummy.pxd
diff --git a/Source/pyboy/window/window_dummy.py → pyboy/window/window_dummy.py b/Source/pyboy/window/window_dummy.py → pyboy/window/window_dummy.py
diff --git a/Source/pyboy/window/window_headless.pxd → pyboy/window/window_headless.pxd b/Source/pyboy/window/window_headless.pxd → pyboy/window/window_headless.pxd
diff --git a/Source/pyboy/window/window_headless.py → pyboy/window/window_headless.py b/Source/pyboy/window/window_headless.py → pyboy/window/window_headless.py
diff --git a/Source/pyboy/window/window_opengl.pxd → pyboy/window/window_opengl.pxd b/Source/pyboy/window/window_opengl.pxd → pyboy/window/window_opengl.pxd
diff --git a/Source/pyboy/window/window_opengl.py → pyboy/window/window_opengl.py b/Source/pyboy/window/window_opengl.py → pyboy/window/window_opengl.py
diff --git a/Source/pyboy/window/window_scanline.pxd → pyboy/window/window_scanline.pxd b/Source/pyboy/window/window_scanline.pxd → pyboy/window/window_scanline.pxd
diff --git a/Source/pyboy/window/window_scanline.py → pyboy/window/window_scanline.py b/Source/pyboy/window/window_scanline.py → pyboy/window/window_scanline.py
diff --git a/Source/pyboy/window/window_sdl2.pxd → pyboy/window/window_sdl2.pxd b/Source/pyboy/window/window_sdl2.pxd → pyboy/window/window_sdl2.pxd
diff --git a/Source/pyboy/window/window_sdl2.py → pyboy/window/window_sdl2.py b/Source/pyboy/window/window_sdl2.py → pyboy/window/window_sdl2.py
diff --git a/Source/pyboy/windowevent.pxd → pyboy/windowevent.pxd b/Source/pyboy/windowevent.pxd → pyboy/windowevent.pxd
diff --git a/Source/pyboy/windowevent.py → pyboy/windowevent.py b/Source/pyboy/windowevent.py → pyboy/windowevent.py