diff --git a/README.md b/README.md index 3414617e..7fdbe539 100644 --- a/README.md +++ b/README.md @@ -459,7 +459,7 @@ source_path = [ - `pip_requirements` - Controls whether to execute `pip install`. Set to `false` to disable this feature, `true` to run `pip install` with `requirements.txt` found in `path`. Or set to another filename which you want to use instead. When `source_path` is passed as a string containing a path (and not a list of maps), and `requirements.txt` is present, `pip install` is automatically executed. - `pip_tmp_dir` - Set the base directory to make the temporary directory for pip installs. Can be useful for Docker in Docker builds. - `poetry_install` - Controls whether to execute `poetry export` and `pip install`. Set to `false` to disable this feature, `true` to run `poetry export` with `pyproject.toml` and `poetry.lock` found in `path`. When `source_path` is passed as a string containing a path (and not a list of maps), and `pyproject.toml` with a build system `poetry` is present, `poetry export` and `pip install` are automatically executed. -- `poetry_extra_args` - A list of additional poetry arguments to add to the poetry export command +- `poetry_export_extra_args` - A list of additional poetry arguments to add to the poetry export command - `npm_requirements` - Controls whether to execute `npm install`. Set to `false` to disable this feature, `true` to run `npm install` with `package.json` found in `path`. Or set to another filename which you want to use instead. - `npm_tmp_dir` - Set the base directory to make the temporary directory for npm installs. Can be useful for Docker in Docker builds. - `prefix_in_zip` - If specified, will be used as a prefix inside zip-archive. By default, everything installs into the root of zip-archive. diff --git a/package.py b/package.py index b01bf645..1552e8e2 100644 --- a/package.py +++ b/package.py @@ -694,7 +694,7 @@ def pip_requirements_step(path, prefix=None, required=False, tmp_dir=None): hash(requirements) def poetry_install_step( - path, poetry_extra_args=[], prefix=None, required=False + path, poetry_export_extra_args=[], prefix=None, required=False ): pyproject_file = path if os.path.isdir(path): @@ -705,7 +705,7 @@ def poetry_install_step( "poetry configuration not found: {}".format(pyproject_file) ) else: - step("poetry", runtime, path, poetry_extra_args, prefix) + step("poetry", runtime, path, poetry_export_extra_args, prefix) hash(pyproject_file) pyproject_path = os.path.dirname(pyproject_file) poetry_lock_file = os.path.join(pyproject_path, "poetry.lock") @@ -809,7 +809,7 @@ def commands_step(path, commands): prefix = claim.get("prefix_in_zip") pip_requirements = claim.get("pip_requirements") poetry_install = claim.get("poetry_install") - poetry_extra_args = claim.get("poetry_extra_args", []) + poetry_export_extra_args = claim.get("poetry_export_extra_args", []) npm_requirements = claim.get("npm_package_json") runtime = claim.get("runtime", query.runtime) @@ -834,7 +834,7 @@ def commands_step(path, commands): poetry_install_step( path, prefix=prefix, - poetry_extra_args=poetry_extra_args, + poetry_export_extra_args=poetry_export_extra_args, required=True, ) @@ -909,11 +909,13 @@ def execute(self, build_plan, zip_stream, query): ( runtime, path, - poetry_extra_args, + poetry_export_extra_args, prefix, ) = action[1:] - log.info("poetry_extra_args: %s", poetry_extra_args) - with install_poetry_dependencies(query, path, poetry_extra_args) as rd: + log.info("poetry_export_extra_args: %s", poetry_export_extra_args) + with install_poetry_dependencies( + query, path, poetry_export_extra_args + ) as rd: if rd: if pf: self._zip_write_with_filter(zs, pf, rd, prefix, timestamp=0) @@ -1108,7 +1110,7 @@ def install_pip_requirements(query, requirements_file, tmp_dir): @contextmanager -def install_poetry_dependencies(query, path, poetry_extra_args): +def install_poetry_dependencies(query, path, poetry_export_extra_args): # TODO: # 1. Emit files instead of temp_dir @@ -1206,7 +1208,7 @@ def copy_file_to_target(file, temp_dir): "--output", "requirements.txt", "--with-credentials", - ] + poetry_extra_args + ] + poetry_export_extra_args poetry_commands = [ [