Move python project back into project root

Consoletation · Nov 17, 2023 · b440c8a · b440c8a
1 parent 9fdd87b
commit b440c8a
Show file tree

Hide file tree

Showing 25 changed files with 184 additions and 191 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+recursive-include . *.hpp
+recursive-include . *.cpp
diff --git a/python/login_server/__init__.py → login_server/__init__.py b/python/login_server/__init__.py → login_server/__init__.py
diff --git a/python/login_server/cli.py → login_server/cli.py b/python/login_server/cli.py → login_server/cli.py
diff --git a/python/login_server/logindb.py → login_server/logindb.py b/python/login_server/logindb.py → login_server/logindb.py
diff --git a/python/login_server/restservice.py → login_server/restservice.py b/python/login_server/restservice.py → login_server/restservice.py
diff --git a/python/login_server/udpservice.py → login_server/udpservice.py b/python/login_server/udpservice.py → login_server/udpservice.py
diff --git a/python/pyproject.toml → pyproject.toml b/python/pyproject.toml → 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
diff --git a/python/MANIFEST.in b/python/MANIFEST.in
diff --git a/python/cpp/GameState.cpp b/python/cpp/GameState.cpp
diff --git a/python/cpp/GameState.hpp b/python/cpp/GameState.hpp
diff --git a/python/cpp/mos6502 b/python/cpp/mos6502
diff --git a/python/cpp/src b/python/cpp/src
diff --git a/python/cpp/tools b/python/cpp/tools
diff --git a/python/ranking_server/__init__.py → ranking_server/__init__.py b/python/ranking_server/__init__.py → ranking_server/__init__.py
diff --git a/python/ranking_server/cli.py → ranking_server/cli.py b/python/ranking_server/cli.py → ranking_server/cli.py
diff --git a/python/ranking_server/rankingdb.py → ranking_server/rankingdb.py b/python/ranking_server/rankingdb.py → ranking_server/rankingdb.py
diff --git a/python/ranking_server/restservice.py → ranking_server/restservice.py b/python/ranking_server/restservice.py → ranking_server/restservice.py
diff --git a/python/replay_server/__init__.py → replay_server/__init__.py b/python/replay_server/__init__.py → replay_server/__init__.py
diff --git a/python/replay_server/cli.py → replay_server/cli.py b/python/replay_server/cli.py → replay_server/cli.py
diff --git a/python/replay_server/replaydb.py → replay_server/replaydb.py b/python/replay_server/replaydb.py → replay_server/replaydb.py
diff --git a/python/replay_server/restservice.py → replay_server/restservice.py b/python/replay_server/restservice.py → replay_server/restservice.py
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		recursive-include . *.hpp
		recursive-include . *.cpp