From b440c8a888c5a794910bfe9e7d4aa6ee64db16ad Mon Sep 17 00:00:00 2001 From: Daniel Porter Date: Fri, 17 Nov 2023 01:35:58 +0000 Subject: [PATCH] Move python project back into project root --- .github/workflows/build-wheels.yml | 3 +- .gitignore | 178 +++++++++++++++++- MANIFEST.in | 2 + .../login_server => login_server}/__init__.py | 0 {python/login_server => login_server}/cli.py | 0 .../login_server => login_server}/logindb.py | 0 .../restservice.py | 0 .../udpservice.py | 0 python/pyproject.toml => pyproject.toml | 1 - python/.gitignore | 176 ----------------- python/MANIFEST.in | 2 - python/cpp/GameState.cpp | 1 - python/cpp/GameState.hpp | 1 - python/cpp/mos6502 | 1 - python/cpp/src | 1 - python/cpp/tools | 1 - .../__init__.py | 0 .../ranking_server => ranking_server}/cli.py | 0 .../rankingdb.py | 0 .../restservice.py | 0 .../__init__.py | 0 .../replay_server => replay_server}/cli.py | 0 .../replaydb.py | 0 .../restservice.py | 0 python/setup.py => setup.py | 8 +- 25 files changed, 184 insertions(+), 191 deletions(-) create mode 100644 MANIFEST.in rename {python/login_server => login_server}/__init__.py (100%) rename {python/login_server => login_server}/cli.py (100%) rename {python/login_server => login_server}/logindb.py (100%) rename {python/login_server => login_server}/restservice.py (100%) rename {python/login_server => login_server}/udpservice.py (100%) rename python/pyproject.toml => pyproject.toml (99%) delete mode 100644 python/.gitignore delete mode 100644 python/MANIFEST.in delete mode 120000 python/cpp/GameState.cpp delete mode 120000 python/cpp/GameState.hpp delete mode 120000 python/cpp/mos6502 delete mode 120000 python/cpp/src delete mode 120000 python/cpp/tools rename {python/ranking_server => ranking_server}/__init__.py (100%) rename {python/ranking_server => ranking_server}/cli.py (100%) rename {python/ranking_server => ranking_server}/rankingdb.py (100%) rename {python/ranking_server => ranking_server}/restservice.py (100%) rename {python/replay_server => replay_server}/__init__.py (100%) rename {python/replay_server => replay_server}/cli.py (100%) rename {python/replay_server => replay_server}/replaydb.py (100%) rename {python/replay_server => replay_server}/restservice.py (100%) rename python/setup.py => setup.py (80%) diff --git a/.github/workflows/build-wheels.yml b/.github/workflows/build-wheels.yml index c21a5fe..bc6b851 100644 --- a/.github/workflows/build-wheels.yml +++ b/.github/workflows/build-wheels.yml @@ -28,9 +28,8 @@ jobs: CIBW_SKIP: cp36-* cp37-* *-musllinux* CIBW_BEFORE_ALL_LINUX: yum install -y libuuid-devel CIBW_BEFORE_BUILD: pip install pybind11 - working-directory: ./python - uses: actions/upload-artifact@v3 with: name: wheels - path: ./python/wheelhouse/*.whl + path: ./wheelhouse/*.whl diff --git a/.gitignore b/.gitignore index 1d153f6..545c0ab 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,180 @@ tools/fm2_player tools/initial_state_dumper src/server/stb_server src/server/stb_server_beta -__pycache__ + +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# 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/ + +### Python Patch ### +# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration +poetry.toml + +# ruff +.ruff_cache/ + +# LSP config files +pyrightconfig.json + +# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..d2e1e3a --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,2 @@ +recursive-include . *.hpp +recursive-include . *.cpp diff --git a/python/login_server/__init__.py b/login_server/__init__.py similarity index 100% rename from python/login_server/__init__.py rename to login_server/__init__.py diff --git a/python/login_server/cli.py b/login_server/cli.py similarity index 100% rename from python/login_server/cli.py rename to login_server/cli.py diff --git a/python/login_server/logindb.py b/login_server/logindb.py similarity index 100% rename from python/login_server/logindb.py rename to login_server/logindb.py diff --git a/python/login_server/restservice.py b/login_server/restservice.py similarity index 100% rename from python/login_server/restservice.py rename to login_server/restservice.py diff --git a/python/login_server/udpservice.py b/login_server/udpservice.py similarity index 100% rename from python/login_server/udpservice.py rename to login_server/udpservice.py diff --git a/python/pyproject.toml b/pyproject.toml similarity index 99% rename from python/pyproject.toml rename to pyproject.toml index c97253a..3be07f3 100644 --- a/python/pyproject.toml +++ b/pyproject.toml @@ -51,7 +51,6 @@ build-backend = 'setuptools.build_meta' find = {} [tool.setuptools_scm] -root = ".." version_scheme = "post-release" [tool.black] diff --git a/python/.gitignore b/python/.gitignore deleted file mode 100644 index ad4a1f1..0000000 --- a/python/.gitignore +++ /dev/null @@ -1,176 +0,0 @@ -# Created by https://www.toptal.com/developers/gitignore/api/python -# Edit at https://www.toptal.com/developers/gitignore?templates=python - -### Python ### -# 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/ - -### Python Patch ### -# Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration -poetry.toml - -# ruff -.ruff_cache/ - -# LSP config files -pyrightconfig.json - -# End of https://www.toptal.com/developers/gitignore/api/python diff --git a/python/MANIFEST.in b/python/MANIFEST.in deleted file mode 100644 index bd45c13..0000000 --- a/python/MANIFEST.in +++ /dev/null @@ -1,2 +0,0 @@ -recursive-include cpp *.hpp -recursive-include cpp *.cpp diff --git a/python/cpp/GameState.cpp b/python/cpp/GameState.cpp deleted file mode 120000 index a0f0260..0000000 --- a/python/cpp/GameState.cpp +++ /dev/null @@ -1 +0,0 @@ -../../src/GameState.cpp \ No newline at end of file diff --git a/python/cpp/GameState.hpp b/python/cpp/GameState.hpp deleted file mode 120000 index 0cab508..0000000 --- a/python/cpp/GameState.hpp +++ /dev/null @@ -1 +0,0 @@ -../../src/GameState.hpp \ No newline at end of file diff --git a/python/cpp/mos6502 b/python/cpp/mos6502 deleted file mode 120000 index 4720640..0000000 --- a/python/cpp/mos6502 +++ /dev/null @@ -1 +0,0 @@ -../../mos6502 \ No newline at end of file diff --git a/python/cpp/src b/python/cpp/src deleted file mode 120000 index 929cb3d..0000000 --- a/python/cpp/src +++ /dev/null @@ -1 +0,0 @@ -../../src \ No newline at end of file diff --git a/python/cpp/tools b/python/cpp/tools deleted file mode 120000 index 31941e9..0000000 --- a/python/cpp/tools +++ /dev/null @@ -1 +0,0 @@ -../../tools \ No newline at end of file diff --git a/python/ranking_server/__init__.py b/ranking_server/__init__.py similarity index 100% rename from python/ranking_server/__init__.py rename to ranking_server/__init__.py diff --git a/python/ranking_server/cli.py b/ranking_server/cli.py similarity index 100% rename from python/ranking_server/cli.py rename to ranking_server/cli.py diff --git a/python/ranking_server/rankingdb.py b/ranking_server/rankingdb.py similarity index 100% rename from python/ranking_server/rankingdb.py rename to ranking_server/rankingdb.py diff --git a/python/ranking_server/restservice.py b/ranking_server/restservice.py similarity index 100% rename from python/ranking_server/restservice.py rename to ranking_server/restservice.py diff --git a/python/replay_server/__init__.py b/replay_server/__init__.py similarity index 100% rename from python/replay_server/__init__.py rename to replay_server/__init__.py diff --git a/python/replay_server/cli.py b/replay_server/cli.py similarity index 100% rename from python/replay_server/cli.py rename to replay_server/cli.py diff --git a/python/replay_server/replaydb.py b/replay_server/replaydb.py similarity index 100% rename from python/replay_server/replaydb.py rename to replay_server/replaydb.py diff --git a/python/replay_server/restservice.py b/replay_server/restservice.py similarity index 100% rename from python/replay_server/restservice.py rename to replay_server/restservice.py diff --git a/python/setup.py b/setup.py similarity index 80% rename from python/setup.py rename to setup.py index 91f1402..b043102 100644 --- a/python/setup.py +++ b/setup.py @@ -9,12 +9,12 @@ Pybind11Extension( "bmov_to_fm2", [ - "cpp/src/GameState.cpp", - "cpp/tools/bmov_to_fm2.cpp", + "src/GameState.cpp", + "tools/bmov_to_fm2.cpp", ], include_dirs=[ - "cpp/src", - "cpp", + "src", + ".", ], define_macros=[("PYBIND11", "1")], extra_compile_args=["-flto"],