Merge branch 'develop'

Author: kitao

.gitattributes

@@ -1,3 +1,2 @@
 * text=auto
 *.whl binary diff=zip
-*.pyxapp linguist-language=Python

.gitignore

@@ -1,163 +1,4 @@
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
 dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/#use-with-ide
-.pdm.toml
-
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
-
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
 venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-
-# Pyxel
+*.pyc
 .DS_Store

.vscode/settings.json

@@ -1,10 +1,3 @@
 {
-  "files.exclude": {
-    "server/pyodide/*": true
-  },
-  "rust-analyzer.linkedProjects": [
-    "crates/pyxel-platform/Cargo.toml",
-    "crates/pyxel-engine/Cargo.toml",
-    "crates/pyxel-wrapper/Cargo.toml"
-  ]
+  "rust-analyzer.linkedProjects": ["rust/Cargo.toml"]
 }

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.0.8
+
+- Changed the directory structure of the project
+- Organized project metadata for Rust and Python
+
 ## 2.0.7
 
 - Turned off the high DPI mode for performance perspective

Makefile

@@ -44,10 +44,10 @@
 
 ROOT_DIR = .
 DIST_DIR = $(ROOT_DIR)/dist
-PYXEL_DIR = $(ROOT_DIR)/python/pyxel
-CRATES_DIR = $(ROOT_DIR)/crates
+RUST_DIR = $(ROOT_DIR)/rust
+PYTHON_DIR = $(ROOT_DIR)/python
+EXAMPLES_DIR = $(PYTHON_DIR)/pyxel/examples
 SCRIPTS_DIR = $(ROOT_DIR)/scripts
-EXAMPLES_DIR = $(PYXEL_DIR)/examples
 WASM_DIR = $(ROOT_DIR)/wasm
 WASM_ENV = RUSTUP_TOOLCHAIN=nightly
 WASM_TARGET = wasm32-unknown-emscripten
@@ -68,37 +68,23 @@ endif
 all: build
 
 clean:
-	@cd $(CRATES_DIR)/pyxel-platform; cargo clean $(BUILD_OPTS)
-	@cd $(CRATES_DIR)/pyxel-engine; cargo clean $(BUILD_OPTS)
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo clean $(BUILD_OPTS)
+	@cd $(RUST_DIR); cargo clean $(BUILD_OPTS)
 
 distclean:
 	@rm -rf $(DIST_DIR)
-	@rm -rf $(CRATES_DIR)/pyxel-platform/target
-	@rm -rf $(CRATES_DIR)/pyxel-engine/target
-	@rm -rf $(CRATES_DIR)/pyxel-wrapper/target
+	@rm -rf $(RUST_DIR)/target
 
 lint:
-	@cd $(CRATES_DIR)/pyxel-platform; cargo +nightly clippy $(CLIPPY_OPTS)
-	@cd $(CRATES_DIR)/pyxel-platform; cargo +nightly clippy --target $(WASM_TARGET) $(CLIPPY_OPTS)
-	@cd $(CRATES_DIR)/pyxel-engine; cargo +nightly clippy $(CLIPPY_OPTS)
-	@cd $(CRATES_DIR)/pyxel-engine; cargo +nightly clippy --target $(WASM_TARGET) $(CLIPPY_OPTS)
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo +nightly clippy $(CLIPPY_OPTS)
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo +nightly clippy --target $(WASM_TARGET) $(CLIPPY_OPTS)
+	@cd $(RUST_DIR); cargo +nightly clippy $(CLIPPY_OPTS)
+	@cd $(RUST_DIR); cargo +nightly clippy --target $(WASM_TARGET) $(CLIPPY_OPTS)
 	@ruff check $(ROOT_DIR)
 
 update:
-	@cd $(CRATES_DIR)/pyxel-platform; cargo update
-	@cd $(CRATES_DIR)/pyxel-engine; cargo update
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo update
-	@cd $(CRATES_DIR)/pyxel-platform; cargo outdated --root-deps-only
-	@cd $(CRATES_DIR)/pyxel-engine; cargo outdated --root-deps-only
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo outdated --root-deps-only
+	@cd $(RUST_DIR); cargo update
+	@cd $(RUST_DIR); cargo outdated --root-deps-only
 
 format:
-	@cd $(CRATES_DIR)/pyxel-platform; cargo +nightly fmt -- --emit=files
-	@cd $(CRATES_DIR)/pyxel-engine; cargo +nightly fmt -- --emit=files
-	@cd $(CRATES_DIR)/pyxel-wrapper; cargo +nightly fmt -- --emit=files
+	@cd $(RUST_DIR); cargo +nightly fmt -- --emit=files
 	@ruff format $(ROOT_DIR)
 
 build: format
@@ -110,8 +96,8 @@ install: build
 	@pip3 install --force-reinstall `ls -rt $(DIST_DIR)/*.whl | tail -n 1`
 
 test: install
-	@cd $(CRATES_DIR)/pyxel-engine; cargo test $(BUILD_OPTS)
-	@python3 -m unittest discover $(CRATES_DIR)/pyxel-wrapper/tests
+	#@cd $(RUST_DIR); cargo test $(BUILD_OPTS)
+	@python3 -m unittest discover $(RUST_DIR)/pyxel-wrapper/tests
 	@pyxel run $(EXAMPLES_DIR)/01_hello_pyxel.py
 	@pyxel run $(EXAMPLES_DIR)/02_jump_game.py
 	@pyxel run $(EXAMPLES_DIR)/03_draw_api.py

pyproject.toml

@@ -4,12 +4,13 @@ build-backend = "maturin"
 
 [project]
 name = "pyxel"
-version = "2.0.7"
+version = "2.0.8"
+requires-python = ">=3.7"
+authors = [{ name = "Takashi Kitao", email = "takashi.kitao@gmail.com" }]
 description = "A retro game engine for Python"
 readme = "docs/README-abspath.md"
-requires-python = ">=3.7"
 license = { file = "LICENSE" }
-authors = [{ name = "Takashi Kitao", email = "takashi.kitao@gmail.com" }]
+keywords = ["game", "gamedev"]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "License :: OSI Approved :: MIT License",
@@ -22,13 +23,17 @@ classifiers = [
     "Topic :: Multimedia :: Graphics",
     "Topic :: Multimedia :: Sound/Audio",
 ]
-urls = { homepage = "https://github.com/kitao/pyxel" }
+
+[project.urls]
+Homepage = "https://github.com/kitao/pyxel"
+Repository = "https://github.com/kitao/pyxel.git"
+Changelog = "https://github.com/kitao/pyxel/blob/main/CHANGELOG.md"
 
 [project.scripts]
 pyxel = "pyxel.cli:cli"
 
 [tool.maturin]
-manifest-path = "crates/pyxel-wrapper/Cargo.toml"
+manifest-path = "rust/pyxel-wrapper/Cargo.toml"
 module-name = "pyxel.pyxel_wrapper"
 python-source = "python"