diff options
Diffstat (limited to 'src_doit/dist')
| -rw-r--r-- | src_doit/dist/__init__.py | 38 | ||||
| -rw-r--r-- | src_doit/dist/container/Dockerfile | 6 | ||||
| -rw-r--r-- | src_doit/dist/windows/opcut-server.cmd (renamed from src_doit/dist/windows/opcut-server.bat) | 0 | ||||
| -rw-r--r-- | src_doit/dist/windows/opcut.cmd (renamed from src_doit/dist/windows/opcut.bat) | 0 |
4 files changed, 5 insertions, 39 deletions
diff --git a/src_doit/dist/__init__.py b/src_doit/dist/__init__.py index 6c490fa..51add24 100644 --- a/src_doit/dist/__init__.py +++ b/src_doit/dist/__init__.py @@ -6,8 +6,7 @@ from hat.doit import common __all__ = ['task_dist', - 'task_dist_windows', - 'task_dist_container'] + 'task_dist_windows'] package_path = Path(__file__).parent @@ -18,9 +17,8 @@ cache_dir = Path('cache') wheel_dir = build_dir / 'py/dist' dist_dir = build_dir / 'dist' dist_windows_dir = dist_dir / f'opcut-{common.get_version()}-windows' -dist_container_dir = dist_dir / f'opcut-{common.get_version()}-container' -win_python_url = 'https://www.python.org/ftp/python/3.9.7/python-3.9.7-embed-amd64.zip' # NOQA +win_python_url = 'https://www.python.org/ftp/python/3.10.7/python-3.10.7-embed-amd64.zip' # NOQA cache_win_python_path = cache_dir / win_python_url.split('/')[-1] @@ -28,8 +26,7 @@ def task_dist(): """Build distribution""" return {'actions': None, - 'task_dep': ['dist_windows', - 'dist_container']} + 'task_dep': ['dist_windows']} def task_dist_windows(): @@ -52,14 +49,14 @@ def task_dist_windows(): with zipfile.ZipFile(str(cache_win_python_path)) as f: f.extractall(str(python_dir)) - python_lib_path = python_dir / 'python39.zip' + python_lib_path = python_dir / 'python310.zip' python_lib_dir = python_dir / 'lib' common.mkdir_p(dist_windows_dir / 'python/lib') with zipfile.ZipFile(str(python_lib_path)) as f: f.extractall(str(python_lib_dir)) common.rm_rf(python_lib_path) - (python_dir / 'python39._pth').write_text( + (python_dir / 'python310._pth').write_text( '..\\packages\n' 'lib\n' '.\n' @@ -87,28 +84,3 @@ def task_dist_windows(): return {'actions': [build], 'task_dep': ['wheel']} - - -def task_dist_container(): - """Build container distribution""" - - def build(): - common.rm_rf(dist_container_dir) - common.mkdir_p(dist_container_dir.parent) - common.cp_r(package_path / 'container', dist_container_dir) - - for i in wheel_dir.glob('*.whl'): - common.cp_r(i, dist_container_dir / i.name) - - name = f'opcut:{common.get_version()}' - img_path = dist_dir / f'{dist_container_dir.name}.tar' - - subprocess.run(['podman', 'build', '-q', '-t', name, '.'], - cwd=str(dist_container_dir), - check=True) - - subprocess.run(['podman', 'save', '-q', '-o', str(img_path), name], - check=True) - - return {'actions': [build], - 'task_dep': ['wheel']} diff --git a/src_doit/dist/container/Dockerfile b/src_doit/dist/container/Dockerfile deleted file mode 100644 index 32978c1..0000000 --- a/src_doit/dist/container/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM python:3.9-slim-bullseye -COPY *.whl . -RUN apt update -qy && \ - apt install -qy pkg-config gcc libcairo2-dev && \ - pip install -qq *.whl && \ - rm *.whl diff --git a/src_doit/dist/windows/opcut-server.bat b/src_doit/dist/windows/opcut-server.cmd index 25ce4f9..25ce4f9 100644 --- a/src_doit/dist/windows/opcut-server.bat +++ b/src_doit/dist/windows/opcut-server.cmd diff --git a/src_doit/dist/windows/opcut.bat b/src_doit/dist/windows/opcut.cmd index 68ae30a..68ae30a 100644 --- a/src_doit/dist/windows/opcut.bat +++ b/src_doit/dist/windows/opcut.cmd |
