From f66831702365936878d44e8b33594bb93da8a595 Mon Sep 17 00:00:00 2001 From: Marat Radchenko Date: Sun, 5 Mar 2023 04:53:53 -0800 Subject: [PATCH] Migrate from `setup.py` to `pyproject.toml` (#297) `pyproject.toml` is a mainstream (as of today) way to organize Python packages. There are multiple reasons for that, I'll just leave some links: * https://peps.python.org/pep-0517/ * https://peps.python.org/pep-0518/ * https://peps.python.org/pep-0621/ * https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html I've also took liberty to add myself to authors list in metadata, hopefully 21% of commits justifies this. Unfortunately, this stuff doesn't properly work with default pip/setuptools shipped with Python 3.6, so it has to be dropped. --- .github/workflows/ci.yml | 18 ++--- pyproject.toml | 56 +++++++++++++++ setup.py | 70 ------------------- {ue4docker => src/ue4docker}/__init__.py | 0 {ue4docker => src/ue4docker}/__main__.py | 0 {ue4docker => src/ue4docker}/build.py | 0 {ue4docker => src/ue4docker}/clean.py | 0 .../ue4docker}/diagnostics/__init__.py | 0 .../ue4docker}/diagnostics/base.py | 0 .../diagnostics/diagnostic_20gig.py | 0 .../ue4docker}/diagnostics/diagnostic_8gig.py | 0 .../ue4docker}/diagnostics/diagnostic_all.py | 0 .../diagnostics/diagnostic_network.py | 0 .../ue4docker}/diagnostics_cmd.py | 0 .../diagnostics/20gig/windows/Dockerfile | 0 .../diagnostics/8gig/linux/Dockerfile | 0 .../diagnostics/8gig/windows/Dockerfile | 0 .../diagnostics/8gig/windows/test.ps1 | 0 .../diagnostics/network/linux/Dockerfile | 0 .../diagnostics/network/windows/Dockerfile | 0 .../ue4-build-prerequisites/linux/Dockerfile | 0 .../windows/.dockerignore | 0 .../windows/.gitignore | 0 .../windows/Dockerfile | 0 .../windows/install-prerequisites.ps1 | 0 .../windows/remove-duplicate-dlls.ps1 | 0 .../dockerfiles/ue4-full/linux/Dockerfile | 0 .../ue4-full/linux/pulseaudio-client.conf | 0 .../dockerfiles/ue4-full/windows/Dockerfile | 0 .../ue4-minimal/linux/.dockerignore | 0 .../dockerfiles/ue4-minimal/linux/Dockerfile | 0 .../ue4-minimal/linux/copy-toolchain.py | 0 .../ue4-minimal/linux/enable-opengl.py | 0 .../ue4-minimal/linux/fix-targets.py | 0 .../ue4-minimal/linux/patch-build-graph.py | 0 .../ue4-minimal/linux/patch-filters-xml.py | 0 .../ue4-minimal/linux/set-changelist.py | 0 .../ue4-minimal/linux/split-components.py | 0 .../ue4-minimal/windows/.dockerignore | 0 .../ue4-minimal/windows/Dockerfile | 0 .../ue4-minimal/windows/fix-targets.py | 0 .../ue4-minimal/windows/patch-build-graph.py | 0 .../ue4-minimal/windows/patch-filters-xml.py | 0 .../ue4-minimal/windows/set-changelist.py | 0 .../ue4-minimal/windows/split-components.py | 0 .../ue4-source/linux/.dockerignore | 0 .../dockerfiles/ue4-source/linux/Dockerfile | 0 .../linux/git-credential-helper-endpoint.sh | 0 .../linux/git-credential-helper-secrets.sh | 0 .../ue4-source/linux/linker-fixup.py | 0 .../ue4-source/linux/patch-broken-releases.py | 0 .../dockerfiles/ue4-source/linux/patch-ubt.py | 0 .../ue4-source/windows/.dockerignore | 0 .../dockerfiles/ue4-source/windows/Dockerfile | 0 .../windows/git-credential-helper.bat | 0 .../windows/patch-broken-releases.py | 0 .../ue4-source/windows/patch-setup-win.py | 0 .../ue4-source/windows/patch-ubt.py | 0 {ue4docker => src/ue4docker}/export.py | 0 .../ue4docker}/exports/__init__.py | 0 .../ue4docker}/exports/export_installed.py | 0 .../ue4docker}/exports/export_packages.py | 0 {ue4docker => src/ue4docker}/info.py | 0 .../infrastructure/BuildConfiguration.py | 0 .../infrastructure/CredentialEndpoint.py | 0 .../ue4docker}/infrastructure/DarwinUtils.py | 0 .../ue4docker}/infrastructure/DockerUtils.py | 0 .../infrastructure/FilesystemUtils.py | 0 .../infrastructure/GlobalConfiguration.py | 0 .../ue4docker}/infrastructure/ImageBuilder.py | 0 .../ue4docker}/infrastructure/ImageCleaner.py | 0 .../ue4docker}/infrastructure/Logger.py | 0 .../ue4docker}/infrastructure/NetworkUtils.py | 0 .../ue4docker}/infrastructure/PackageUtils.py | 0 .../infrastructure/PrettyPrinting.py | 0 .../infrastructure/ResourceMonitor.py | 0 .../infrastructure/SubprocessUtils.py | 2 +- .../ue4docker}/infrastructure/WindowsUtils.py | 0 .../ue4docker}/infrastructure/__init__.py | 0 {ue4docker => src/ue4docker}/main.py | 0 {ue4docker => src/ue4docker}/setup_cmd.py | 0 {ue4docker => src/ue4docker}/test.py | 0 .../ue4docker}/tests/build-and-package.py | 0 .../ue4docker}/tests/consume-external-deps.py | 0 src/ue4docker/version.py | 8 +++ {ue4docker => src/ue4docker}/version_cmd.py | 0 ue4docker/version.py | 1 - 87 files changed, 74 insertions(+), 81 deletions(-) create mode 100644 pyproject.toml delete mode 100644 setup.py rename {ue4docker => src/ue4docker}/__init__.py (100%) rename {ue4docker => src/ue4docker}/__main__.py (100%) rename {ue4docker => src/ue4docker}/build.py (100%) rename {ue4docker => src/ue4docker}/clean.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/__init__.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/base.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/diagnostic_20gig.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/diagnostic_8gig.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/diagnostic_all.py (100%) rename {ue4docker => src/ue4docker}/diagnostics/diagnostic_network.py (100%) rename {ue4docker => src/ue4docker}/diagnostics_cmd.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/20gig/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/8gig/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/8gig/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/8gig/windows/test.ps1 (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/network/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/diagnostics/network/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/windows/.dockerignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/windows/.gitignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1 (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-build-prerequisites/windows/remove-duplicate-dlls.ps1 (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-full/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-full/linux/pulseaudio-client.conf (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-full/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/.dockerignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/copy-toolchain.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/enable-opengl.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/fix-targets.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/patch-build-graph.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/patch-filters-xml.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/set-changelist.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/linux/split-components.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/.dockerignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/fix-targets.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/patch-build-graph.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/patch-filters-xml.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/set-changelist.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-minimal/windows/split-components.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/.dockerignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/git-credential-helper-endpoint.sh (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/git-credential-helper-secrets.sh (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/linker-fixup.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/patch-broken-releases.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/linux/patch-ubt.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/.dockerignore (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/Dockerfile (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/git-credential-helper.bat (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/patch-broken-releases.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/patch-setup-win.py (100%) rename {ue4docker => src/ue4docker}/dockerfiles/ue4-source/windows/patch-ubt.py (100%) rename {ue4docker => src/ue4docker}/export.py (100%) rename {ue4docker => src/ue4docker}/exports/__init__.py (100%) rename {ue4docker => src/ue4docker}/exports/export_installed.py (100%) rename {ue4docker => src/ue4docker}/exports/export_packages.py (100%) rename {ue4docker => src/ue4docker}/info.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/BuildConfiguration.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/CredentialEndpoint.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/DarwinUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/DockerUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/FilesystemUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/GlobalConfiguration.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/ImageBuilder.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/ImageCleaner.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/Logger.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/NetworkUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/PackageUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/PrettyPrinting.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/ResourceMonitor.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/SubprocessUtils.py (98%) rename {ue4docker => src/ue4docker}/infrastructure/WindowsUtils.py (100%) rename {ue4docker => src/ue4docker}/infrastructure/__init__.py (100%) rename {ue4docker => src/ue4docker}/main.py (100%) rename {ue4docker => src/ue4docker}/setup_cmd.py (100%) rename {ue4docker => src/ue4docker}/test.py (100%) rename {ue4docker => src/ue4docker}/tests/build-and-package.py (100%) rename {ue4docker => src/ue4docker}/tests/consume-external-deps.py (100%) create mode 100644 src/ue4docker/version.py rename {ue4docker => src/ue4docker}/version_cmd.py (100%) delete mode 100644 ue4docker/version.py diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97c2aab2..62387d4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: with: python-version: "3.10" - name: Install dependencies - run: pip install setuptools wheel + run: pip install --upgrade build - name: Build package - run: python setup.py sdist bdist_wheel + run: python -m build - name: Publish to PyPI if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@release/v1 @@ -29,20 +29,20 @@ jobs: strategy: matrix: include: - - { os: ubuntu-20.04, python: "3.6" } + - { os: ubuntu-20.04, python: "3.7" } - { os: ubuntu-20.04, python: "3.10" } - { os: ubuntu-22.04, python: "3.10" } - - { os: windows-2019, python: "3.6", visual-studio: 2017 } + - { os: windows-2019, python: "3.7", visual-studio: 2017 } - { os: windows-2019, python: "3.10", visual-studio: 2017 } - - { os: windows-2019, python: "3.6", visual-studio: 2019 } + - { os: windows-2019, python: "3.7", visual-studio: 2019 } - { os: windows-2019, python: "3.10", visual-studio: 2019 } - - { os: windows-2019, python: "3.6", visual-studio: 2022 } + - { os: windows-2019, python: "3.7", visual-studio: 2022 } - { os: windows-2019, python: "3.10", visual-studio: 2022 } - - { os: windows-latest, python: "3.6", visual-studio: 2017 } + - { os: windows-latest, python: "3.7", visual-studio: 2017 } - { os: windows-latest, python: "3.10", visual-studio: 2017 } - - { os: windows-latest, python: "3.6", visual-studio: 2019 } + - { os: windows-latest, python: "3.7", visual-studio: 2019 } - { os: windows-latest, python: "3.10", visual-studio: 2019 } - - { os: windows-latest, python: "3.6", visual-studio: 2022 } + - { os: windows-latest, python: "3.7", visual-studio: 2022 } - { os: windows-latest, python: "3.10", visual-studio: 2022 } runs-on: ${{ matrix.os }} steps: diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..518e3e91 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,56 @@ +[project] +name = "ue4-docker" +version = "0.0.103" +description = "Windows and Linux containers for Unreal Engine" +requires-python = ">= 3.7" +license = { file = "LICENSE" } +authors = [ + { name = "Adam Rehn", email = "adam@adamrehn.com" }, + { name = "Marat Radchenko", email = "marat@slonopotamus.org" }, +] +keywords = [ + "unreal engine", + "docker", +] +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: Developers", + "License :: OSI Approved :: MIT License", + "Programming Language :: Python :: 3", + "Topic :: Software Development :: Build Tools", +] +dependencies = [ + "colorama", + "container-utils", + "docker>=3.0.0", + "humanfriendly", + "importlib-metadata>=1.0;python_version<'3.8'", + "Jinja2>=2.11.3", + "packaging>=19.1", + "psutil", + "requests", + "semver>=2.7.9,<3.0.0", + "termcolor", +] + +[project.urls] +homepage = "https://github.com/adamrehn/ue4-docker" + +[project.scripts] +ue4-docker = "ue4docker:main" + +[build-system] +requires = [ + "setuptools>=61", + "wheel", +] +build-backend = "setuptools.build_meta" + +[tool.setuptools.package-data] +ue4docker = [ + "dockerfiles/*/*/.dockerignore", + "dockerfiles/diagnostics/*/*/*", + "dockerfiles/*/*/*", + "tests/*.py", +] diff --git a/setup.py b/setup.py deleted file mode 100644 index ef9365ff..00000000 --- a/setup.py +++ /dev/null @@ -1,70 +0,0 @@ -from os.path import abspath, dirname, join -from setuptools import setup - -# Read the README markdown data from README.adoc -with open(abspath(join(dirname(__file__), "README.adoc")), "rb") as readmeFile: - __readme__ = readmeFile.read().decode("utf-8") - -# Read the version number from version.py -with open(abspath(join(dirname(__file__), "ue4docker", "version.py"))) as versionFile: - __version__ = ( - versionFile.read().strip().replace("__version__ = ", "").replace('"', "") - ) - -setup( - name="ue4-docker", - version=__version__, - description="Windows and Linux containers for Unreal Engine 4", - long_description=__readme__, - long_description_content_type="text/markdown", - classifiers=[ - "License :: OSI Approved :: MIT License", - "Programming Language :: Python :: 3.6", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - "Topic :: Software Development :: Build Tools", - "Environment :: Console", - ], - keywords="epic unreal engine docker", - url="http://github.com/adamrehn/ue4-docker", - author="Adam Rehn", - author_email="adam@adamrehn.com", - license="MIT", - packages=[ - "ue4docker", - "ue4docker.diagnostics", - "ue4docker.exports", - "ue4docker.infrastructure", - ], - zip_safe=False, - python_requires=">=3.6", - install_requires=[ - "colorama", - "container-utils", - "docker>=3.0.0", - "humanfriendly", - "Jinja2>=2.11.3", - "packaging>=19.1", - "psutil", - "requests", - "semver>=2.7.9,<3.0.0", - # We want newer setuptools to avoid shim path bug on newer Pythons. - # See #231 and https://github.com/pypa/setuptools/issues/3001 - # Unfortunately, that version of setuptools doesn't have Python 3.6 support - "setuptools>=60.4.0;python_version>='3.7.0'", - "termcolor", - "twine>=1.11.0", - "wheel>=0.31.0", - ], - package_data={ - "ue4docker": [ - "dockerfiles/*/*/.dockerignore", - "dockerfiles/diagnostics/*/*/*", - "dockerfiles/*/*/*", - "tests/*.py", - ] - }, - entry_points={"console_scripts": ["ue4-docker=ue4docker:main"]}, -) diff --git a/ue4docker/__init__.py b/src/ue4docker/__init__.py similarity index 100% rename from ue4docker/__init__.py rename to src/ue4docker/__init__.py diff --git a/ue4docker/__main__.py b/src/ue4docker/__main__.py similarity index 100% rename from ue4docker/__main__.py rename to src/ue4docker/__main__.py diff --git a/ue4docker/build.py b/src/ue4docker/build.py similarity index 100% rename from ue4docker/build.py rename to src/ue4docker/build.py diff --git a/ue4docker/clean.py b/src/ue4docker/clean.py similarity index 100% rename from ue4docker/clean.py rename to src/ue4docker/clean.py diff --git a/ue4docker/diagnostics/__init__.py b/src/ue4docker/diagnostics/__init__.py similarity index 100% rename from ue4docker/diagnostics/__init__.py rename to src/ue4docker/diagnostics/__init__.py diff --git a/ue4docker/diagnostics/base.py b/src/ue4docker/diagnostics/base.py similarity index 100% rename from ue4docker/diagnostics/base.py rename to src/ue4docker/diagnostics/base.py diff --git a/ue4docker/diagnostics/diagnostic_20gig.py b/src/ue4docker/diagnostics/diagnostic_20gig.py similarity index 100% rename from ue4docker/diagnostics/diagnostic_20gig.py rename to src/ue4docker/diagnostics/diagnostic_20gig.py diff --git a/ue4docker/diagnostics/diagnostic_8gig.py b/src/ue4docker/diagnostics/diagnostic_8gig.py similarity index 100% rename from ue4docker/diagnostics/diagnostic_8gig.py rename to src/ue4docker/diagnostics/diagnostic_8gig.py diff --git a/ue4docker/diagnostics/diagnostic_all.py b/src/ue4docker/diagnostics/diagnostic_all.py similarity index 100% rename from ue4docker/diagnostics/diagnostic_all.py rename to src/ue4docker/diagnostics/diagnostic_all.py diff --git a/ue4docker/diagnostics/diagnostic_network.py b/src/ue4docker/diagnostics/diagnostic_network.py similarity index 100% rename from ue4docker/diagnostics/diagnostic_network.py rename to src/ue4docker/diagnostics/diagnostic_network.py diff --git a/ue4docker/diagnostics_cmd.py b/src/ue4docker/diagnostics_cmd.py similarity index 100% rename from ue4docker/diagnostics_cmd.py rename to src/ue4docker/diagnostics_cmd.py diff --git a/ue4docker/dockerfiles/diagnostics/20gig/windows/Dockerfile b/src/ue4docker/dockerfiles/diagnostics/20gig/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/diagnostics/20gig/windows/Dockerfile rename to src/ue4docker/dockerfiles/diagnostics/20gig/windows/Dockerfile diff --git a/ue4docker/dockerfiles/diagnostics/8gig/linux/Dockerfile b/src/ue4docker/dockerfiles/diagnostics/8gig/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/diagnostics/8gig/linux/Dockerfile rename to src/ue4docker/dockerfiles/diagnostics/8gig/linux/Dockerfile diff --git a/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile b/src/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile rename to src/ue4docker/dockerfiles/diagnostics/8gig/windows/Dockerfile diff --git a/ue4docker/dockerfiles/diagnostics/8gig/windows/test.ps1 b/src/ue4docker/dockerfiles/diagnostics/8gig/windows/test.ps1 similarity index 100% rename from ue4docker/dockerfiles/diagnostics/8gig/windows/test.ps1 rename to src/ue4docker/dockerfiles/diagnostics/8gig/windows/test.ps1 diff --git a/ue4docker/dockerfiles/diagnostics/network/linux/Dockerfile b/src/ue4docker/dockerfiles/diagnostics/network/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/diagnostics/network/linux/Dockerfile rename to src/ue4docker/dockerfiles/diagnostics/network/linux/Dockerfile diff --git a/ue4docker/dockerfiles/diagnostics/network/windows/Dockerfile b/src/ue4docker/dockerfiles/diagnostics/network/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/diagnostics/network/windows/Dockerfile rename to src/ue4docker/dockerfiles/diagnostics/network/windows/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/linux/Dockerfile b/src/ue4docker/dockerfiles/ue4-build-prerequisites/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/linux/Dockerfile rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/linux/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.dockerignore b/src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.dockerignore similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/windows/.dockerignore rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.dockerignore diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.gitignore b/src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.gitignore similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/windows/.gitignore rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/.gitignore diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/windows/Dockerfile b/src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/windows/Dockerfile rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1 b/src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1 similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1 rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/install-prerequisites.ps1 diff --git a/ue4docker/dockerfiles/ue4-build-prerequisites/windows/remove-duplicate-dlls.ps1 b/src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/remove-duplicate-dlls.ps1 similarity index 100% rename from ue4docker/dockerfiles/ue4-build-prerequisites/windows/remove-duplicate-dlls.ps1 rename to src/ue4docker/dockerfiles/ue4-build-prerequisites/windows/remove-duplicate-dlls.ps1 diff --git a/ue4docker/dockerfiles/ue4-full/linux/Dockerfile b/src/ue4docker/dockerfiles/ue4-full/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-full/linux/Dockerfile rename to src/ue4docker/dockerfiles/ue4-full/linux/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-full/linux/pulseaudio-client.conf b/src/ue4docker/dockerfiles/ue4-full/linux/pulseaudio-client.conf similarity index 100% rename from ue4docker/dockerfiles/ue4-full/linux/pulseaudio-client.conf rename to src/ue4docker/dockerfiles/ue4-full/linux/pulseaudio-client.conf diff --git a/ue4docker/dockerfiles/ue4-full/windows/Dockerfile b/src/ue4docker/dockerfiles/ue4-full/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-full/windows/Dockerfile rename to src/ue4docker/dockerfiles/ue4-full/windows/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/.dockerignore b/src/ue4docker/dockerfiles/ue4-minimal/linux/.dockerignore similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/.dockerignore rename to src/ue4docker/dockerfiles/ue4-minimal/linux/.dockerignore diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/Dockerfile b/src/ue4docker/dockerfiles/ue4-minimal/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/Dockerfile rename to src/ue4docker/dockerfiles/ue4-minimal/linux/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/copy-toolchain.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/copy-toolchain.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/copy-toolchain.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/copy-toolchain.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/enable-opengl.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/enable-opengl.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/enable-opengl.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/enable-opengl.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/fix-targets.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/fix-targets.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/fix-targets.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/fix-targets.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/patch-build-graph.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/patch-build-graph.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/patch-build-graph.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/patch-build-graph.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/patch-filters-xml.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/patch-filters-xml.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/patch-filters-xml.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/patch-filters-xml.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/set-changelist.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/set-changelist.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/set-changelist.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/set-changelist.py diff --git a/ue4docker/dockerfiles/ue4-minimal/linux/split-components.py b/src/ue4docker/dockerfiles/ue4-minimal/linux/split-components.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/linux/split-components.py rename to src/ue4docker/dockerfiles/ue4-minimal/linux/split-components.py diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/.dockerignore b/src/ue4docker/dockerfiles/ue4-minimal/windows/.dockerignore similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/.dockerignore rename to src/ue4docker/dockerfiles/ue4-minimal/windows/.dockerignore diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/Dockerfile b/src/ue4docker/dockerfiles/ue4-minimal/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/Dockerfile rename to src/ue4docker/dockerfiles/ue4-minimal/windows/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/fix-targets.py b/src/ue4docker/dockerfiles/ue4-minimal/windows/fix-targets.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/fix-targets.py rename to src/ue4docker/dockerfiles/ue4-minimal/windows/fix-targets.py diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/patch-build-graph.py b/src/ue4docker/dockerfiles/ue4-minimal/windows/patch-build-graph.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/patch-build-graph.py rename to src/ue4docker/dockerfiles/ue4-minimal/windows/patch-build-graph.py diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/patch-filters-xml.py b/src/ue4docker/dockerfiles/ue4-minimal/windows/patch-filters-xml.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/patch-filters-xml.py rename to src/ue4docker/dockerfiles/ue4-minimal/windows/patch-filters-xml.py diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/set-changelist.py b/src/ue4docker/dockerfiles/ue4-minimal/windows/set-changelist.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/set-changelist.py rename to src/ue4docker/dockerfiles/ue4-minimal/windows/set-changelist.py diff --git a/ue4docker/dockerfiles/ue4-minimal/windows/split-components.py b/src/ue4docker/dockerfiles/ue4-minimal/windows/split-components.py similarity index 100% rename from ue4docker/dockerfiles/ue4-minimal/windows/split-components.py rename to src/ue4docker/dockerfiles/ue4-minimal/windows/split-components.py diff --git a/ue4docker/dockerfiles/ue4-source/linux/.dockerignore b/src/ue4docker/dockerfiles/ue4-source/linux/.dockerignore similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/.dockerignore rename to src/ue4docker/dockerfiles/ue4-source/linux/.dockerignore diff --git a/ue4docker/dockerfiles/ue4-source/linux/Dockerfile b/src/ue4docker/dockerfiles/ue4-source/linux/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/Dockerfile rename to src/ue4docker/dockerfiles/ue4-source/linux/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-endpoint.sh b/src/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-endpoint.sh similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-endpoint.sh rename to src/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-endpoint.sh diff --git a/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-secrets.sh b/src/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-secrets.sh similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-secrets.sh rename to src/ue4docker/dockerfiles/ue4-source/linux/git-credential-helper-secrets.sh diff --git a/ue4docker/dockerfiles/ue4-source/linux/linker-fixup.py b/src/ue4docker/dockerfiles/ue4-source/linux/linker-fixup.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/linker-fixup.py rename to src/ue4docker/dockerfiles/ue4-source/linux/linker-fixup.py diff --git a/ue4docker/dockerfiles/ue4-source/linux/patch-broken-releases.py b/src/ue4docker/dockerfiles/ue4-source/linux/patch-broken-releases.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/patch-broken-releases.py rename to src/ue4docker/dockerfiles/ue4-source/linux/patch-broken-releases.py diff --git a/ue4docker/dockerfiles/ue4-source/linux/patch-ubt.py b/src/ue4docker/dockerfiles/ue4-source/linux/patch-ubt.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/linux/patch-ubt.py rename to src/ue4docker/dockerfiles/ue4-source/linux/patch-ubt.py diff --git a/ue4docker/dockerfiles/ue4-source/windows/.dockerignore b/src/ue4docker/dockerfiles/ue4-source/windows/.dockerignore similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/.dockerignore rename to src/ue4docker/dockerfiles/ue4-source/windows/.dockerignore diff --git a/ue4docker/dockerfiles/ue4-source/windows/Dockerfile b/src/ue4docker/dockerfiles/ue4-source/windows/Dockerfile similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/Dockerfile rename to src/ue4docker/dockerfiles/ue4-source/windows/Dockerfile diff --git a/ue4docker/dockerfiles/ue4-source/windows/git-credential-helper.bat b/src/ue4docker/dockerfiles/ue4-source/windows/git-credential-helper.bat similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/git-credential-helper.bat rename to src/ue4docker/dockerfiles/ue4-source/windows/git-credential-helper.bat diff --git a/ue4docker/dockerfiles/ue4-source/windows/patch-broken-releases.py b/src/ue4docker/dockerfiles/ue4-source/windows/patch-broken-releases.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/patch-broken-releases.py rename to src/ue4docker/dockerfiles/ue4-source/windows/patch-broken-releases.py diff --git a/ue4docker/dockerfiles/ue4-source/windows/patch-setup-win.py b/src/ue4docker/dockerfiles/ue4-source/windows/patch-setup-win.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/patch-setup-win.py rename to src/ue4docker/dockerfiles/ue4-source/windows/patch-setup-win.py diff --git a/ue4docker/dockerfiles/ue4-source/windows/patch-ubt.py b/src/ue4docker/dockerfiles/ue4-source/windows/patch-ubt.py similarity index 100% rename from ue4docker/dockerfiles/ue4-source/windows/patch-ubt.py rename to src/ue4docker/dockerfiles/ue4-source/windows/patch-ubt.py diff --git a/ue4docker/export.py b/src/ue4docker/export.py similarity index 100% rename from ue4docker/export.py rename to src/ue4docker/export.py diff --git a/ue4docker/exports/__init__.py b/src/ue4docker/exports/__init__.py similarity index 100% rename from ue4docker/exports/__init__.py rename to src/ue4docker/exports/__init__.py diff --git a/ue4docker/exports/export_installed.py b/src/ue4docker/exports/export_installed.py similarity index 100% rename from ue4docker/exports/export_installed.py rename to src/ue4docker/exports/export_installed.py diff --git a/ue4docker/exports/export_packages.py b/src/ue4docker/exports/export_packages.py similarity index 100% rename from ue4docker/exports/export_packages.py rename to src/ue4docker/exports/export_packages.py diff --git a/ue4docker/info.py b/src/ue4docker/info.py similarity index 100% rename from ue4docker/info.py rename to src/ue4docker/info.py diff --git a/ue4docker/infrastructure/BuildConfiguration.py b/src/ue4docker/infrastructure/BuildConfiguration.py similarity index 100% rename from ue4docker/infrastructure/BuildConfiguration.py rename to src/ue4docker/infrastructure/BuildConfiguration.py diff --git a/ue4docker/infrastructure/CredentialEndpoint.py b/src/ue4docker/infrastructure/CredentialEndpoint.py similarity index 100% rename from ue4docker/infrastructure/CredentialEndpoint.py rename to src/ue4docker/infrastructure/CredentialEndpoint.py diff --git a/ue4docker/infrastructure/DarwinUtils.py b/src/ue4docker/infrastructure/DarwinUtils.py similarity index 100% rename from ue4docker/infrastructure/DarwinUtils.py rename to src/ue4docker/infrastructure/DarwinUtils.py diff --git a/ue4docker/infrastructure/DockerUtils.py b/src/ue4docker/infrastructure/DockerUtils.py similarity index 100% rename from ue4docker/infrastructure/DockerUtils.py rename to src/ue4docker/infrastructure/DockerUtils.py diff --git a/ue4docker/infrastructure/FilesystemUtils.py b/src/ue4docker/infrastructure/FilesystemUtils.py similarity index 100% rename from ue4docker/infrastructure/FilesystemUtils.py rename to src/ue4docker/infrastructure/FilesystemUtils.py diff --git a/ue4docker/infrastructure/GlobalConfiguration.py b/src/ue4docker/infrastructure/GlobalConfiguration.py similarity index 100% rename from ue4docker/infrastructure/GlobalConfiguration.py rename to src/ue4docker/infrastructure/GlobalConfiguration.py diff --git a/ue4docker/infrastructure/ImageBuilder.py b/src/ue4docker/infrastructure/ImageBuilder.py similarity index 100% rename from ue4docker/infrastructure/ImageBuilder.py rename to src/ue4docker/infrastructure/ImageBuilder.py diff --git a/ue4docker/infrastructure/ImageCleaner.py b/src/ue4docker/infrastructure/ImageCleaner.py similarity index 100% rename from ue4docker/infrastructure/ImageCleaner.py rename to src/ue4docker/infrastructure/ImageCleaner.py diff --git a/ue4docker/infrastructure/Logger.py b/src/ue4docker/infrastructure/Logger.py similarity index 100% rename from ue4docker/infrastructure/Logger.py rename to src/ue4docker/infrastructure/Logger.py diff --git a/ue4docker/infrastructure/NetworkUtils.py b/src/ue4docker/infrastructure/NetworkUtils.py similarity index 100% rename from ue4docker/infrastructure/NetworkUtils.py rename to src/ue4docker/infrastructure/NetworkUtils.py diff --git a/ue4docker/infrastructure/PackageUtils.py b/src/ue4docker/infrastructure/PackageUtils.py similarity index 100% rename from ue4docker/infrastructure/PackageUtils.py rename to src/ue4docker/infrastructure/PackageUtils.py diff --git a/ue4docker/infrastructure/PrettyPrinting.py b/src/ue4docker/infrastructure/PrettyPrinting.py similarity index 100% rename from ue4docker/infrastructure/PrettyPrinting.py rename to src/ue4docker/infrastructure/PrettyPrinting.py diff --git a/ue4docker/infrastructure/ResourceMonitor.py b/src/ue4docker/infrastructure/ResourceMonitor.py similarity index 100% rename from ue4docker/infrastructure/ResourceMonitor.py rename to src/ue4docker/infrastructure/ResourceMonitor.py diff --git a/ue4docker/infrastructure/SubprocessUtils.py b/src/ue4docker/infrastructure/SubprocessUtils.py similarity index 98% rename from ue4docker/infrastructure/SubprocessUtils.py rename to src/ue4docker/infrastructure/SubprocessUtils.py index 429b6ea5..6dedf0e8 100644 --- a/ue4docker/infrastructure/SubprocessUtils.py +++ b/src/ue4docker/infrastructure/SubprocessUtils.py @@ -36,7 +36,7 @@ def capture(command, check=True, **kwargs): stdout=subprocess.PIPE, stderr=subprocess.PIPE, check=check, - **kwargs + **kwargs, ) except subprocess.CalledProcessError as e: raise VerboseCalledProcessError(e) from None diff --git a/ue4docker/infrastructure/WindowsUtils.py b/src/ue4docker/infrastructure/WindowsUtils.py similarity index 100% rename from ue4docker/infrastructure/WindowsUtils.py rename to src/ue4docker/infrastructure/WindowsUtils.py diff --git a/ue4docker/infrastructure/__init__.py b/src/ue4docker/infrastructure/__init__.py similarity index 100% rename from ue4docker/infrastructure/__init__.py rename to src/ue4docker/infrastructure/__init__.py diff --git a/ue4docker/main.py b/src/ue4docker/main.py similarity index 100% rename from ue4docker/main.py rename to src/ue4docker/main.py diff --git a/ue4docker/setup_cmd.py b/src/ue4docker/setup_cmd.py similarity index 100% rename from ue4docker/setup_cmd.py rename to src/ue4docker/setup_cmd.py diff --git a/ue4docker/test.py b/src/ue4docker/test.py similarity index 100% rename from ue4docker/test.py rename to src/ue4docker/test.py diff --git a/ue4docker/tests/build-and-package.py b/src/ue4docker/tests/build-and-package.py similarity index 100% rename from ue4docker/tests/build-and-package.py rename to src/ue4docker/tests/build-and-package.py diff --git a/ue4docker/tests/consume-external-deps.py b/src/ue4docker/tests/consume-external-deps.py similarity index 100% rename from ue4docker/tests/consume-external-deps.py rename to src/ue4docker/tests/consume-external-deps.py diff --git a/src/ue4docker/version.py b/src/ue4docker/version.py new file mode 100644 index 00000000..33ec3a65 --- /dev/null +++ b/src/ue4docker/version.py @@ -0,0 +1,8 @@ +import sys + +if sys.version_info >= (3, 8): + from importlib import metadata +else: + import importlib_metadata as metadata + +__version__ = metadata.version("ue4-docker") diff --git a/ue4docker/version_cmd.py b/src/ue4docker/version_cmd.py similarity index 100% rename from ue4docker/version_cmd.py rename to src/ue4docker/version_cmd.py diff --git a/ue4docker/version.py b/ue4docker/version.py deleted file mode 100644 index 90d621e4..00000000 --- a/ue4docker/version.py +++ /dev/null @@ -1 +0,0 @@ -__version__ = "0.0.103"