Commit 65ffea2

gilandoseantonbabenko

and

authored

feat: Allow temp dir for poetry docker builds (#638)

Co-authored-by: Anton Babenko <anton@antonbabenko.com>

1 parent 9bbe65d commit 65ffea2Copy full SHA for 65ffea2

File tree

2 files changed

+10

-11

lines changed

examples/build-package
- main.tf
package.py

2 files changed

+10

-11

lines changed

`‎examples/build-package/main.tf`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -426,6 +426,7 @@ module "lambda_layer_poetry" {`
`426`	`426`	`{`
`427`	`427`	`path = "${path.module}/../fixtures/python-app-poetry"`
`428`	`428`	`poetry_install = true`
	`429`	`+ poetry_tmp_dir = "${path.cwd}/../fixtures"`
`429`	`430`	`}`
`430`	`431`	`]`
`431`	`432`	`hash_extra = "extra-hash-to-prevent-conflicts-with-module.package_dir"`

`‎package.py`

Lines changed: 9 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -707,7 +707,7 @@ def pip_requirements_step(path, prefix=None, required=False, tmp_dir=None):`
`707`	`707`	`hash(requirements)`
`708`	`708`
`709`	`709`	`def poetry_install_step(`
`710`		`- path, poetry_export_extra_args=[], prefix=None, required=False`
	`710`	`+ path, poetry_export_extra_args=[], prefix=None, required=False, tmp_dir=None`
`711`	`711`	`):`
`712`	`712`	`pyproject_file = path`
`713`	`713`	`if os.path.isdir(path):`
`@@ -718,7 +718,7 @@ def poetry_install_step(`
`718`	`718`	`"poetry configuration not found: {}".format(pyproject_file)`
`719`	`719`	`)`
`720`	`720`	`else:`
`721`		`- step("poetry", runtime, path, poetry_export_extra_args, prefix)`
	`721`	`+ step("poetry", runtime, path, poetry_export_extra_args, prefix, tmp_dir)`
`722`	`722`	`hash(pyproject_file)`
`723`	`723`	`pyproject_path = os.path.dirname(pyproject_file)`
`724`	`724`	`poetry_lock_file = os.path.join(pyproject_path, "poetry.lock")`
`@@ -849,6 +849,7 @@ def commands_step(path, commands):`
`849`	`849`	`prefix=prefix,`
`850`	`850`	`poetry_export_extra_args=poetry_export_extra_args,`
`851`	`851`	`required=True,`
	`852`	`+ tmp_dir=claim.get("poetry_tmp_dir"),`
`852`	`853`	`)`
`853`	`854`
`854`	`855`	`if npm_requirements and runtime.startswith("nodejs"):`
`@@ -949,15 +950,12 @@ def execute(self, build_plan, zip_stream, query):`
`949`	`950`	`# XXX: timestamp=0 - what actually do with it?`
`950`	`951`	`zs.write_dirs(rd, prefix=prefix, timestamp=0)`
`951`	`952`	`elif cmd == "poetry":`
`952`		`- (`
`953`		`- runtime,`
`954`		`- path,`
`955`		`- poetry_export_extra_args,`
`956`		`- prefix,`
`957`		`- ) = action[1:]`
	`953`	`+ (runtime, path, poetry_export_extra_args, prefix, tmp_dir) = action[`
	`954`	`+ 1:`
	`955`	`+ ]`
`958`	`956`	`log.info("poetry_export_extra_args: %s", poetry_export_extra_args)`
`959`	`957`	`with install_poetry_dependencies(`
`960`		`- query, path, poetry_export_extra_args`
	`958`	`+ query, path, poetry_export_extra_args, tmp_dir`
`961`	`959`	`) as rd:`
`962`	`960`	`if rd:`
`963`	`961`	`if pf:`
`@@ -1177,7 +1175,7 @@ def install_pip_requirements(query, requirements_file, tmp_dir):`
`1177`	`1175`
`1178`	`1176`
`1179`	`1177`	`@contextmanager`
`1180`		`-def install_poetry_dependencies(query, path, poetry_export_extra_args):`
	`1178`	`+def install_poetry_dependencies(query, path, poetry_export_extra_args, tmp_dir):`
`1181`	`1179`	`# TODO:`
`1182`	`1180`	`# 1. Emit files instead of temp_dir`
`1183`	`1181`
`@@ -1231,7 +1229,7 @@ def install_poetry_dependencies(query, path, poetry_export_extra_args):`
`1231`	`1229`	`working_dir = os.getcwd()`
`1232`	`1230`
`1233`	`1231`	`log.info("Installing python dependencies with poetry & pip: %s", poetry_lock_file)`
`1234`		`- with tempdir() as temp_dir:`
	`1232`	`+ with tempdir(tmp_dir) as temp_dir:`
`1235`	`1233`
`1236`	`1234`	`def copy_file_to_target(file, temp_dir):`
`1237`	`1235`	`filename = os.path.basename(file)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 65ffea2

File tree

2 files changed

2 files changed

`‎examples/build-package/main.tf`

`‎package.py`

0 commit comments