Skip to content

Commit

Permalink
Updated naming conversion for poetry additional arguments and updated…
Browse files Browse the repository at this point in the history
… docs (readme)
  • Loading branch information
morganchorlton3 committed Jun 11, 2024
1 parent 3fad7ae commit c32a87c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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_groups` - A list of poetry dependency groups to install can be left empty to default to default dependencies
- `poetry_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.
Expand Down
18 changes: 9 additions & 9 deletions package.py
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,7 @@ def pip_requirements_step(path, prefix=None, required=False, tmp_dir=None):
step("pip", runtime, requirements, prefix, tmp_dir)
hash(requirements)

def poetry_install_step(path, poetry_args=[], prefix=None, required=False):
def poetry_install_step(path, poetry_extra_args=[], prefix=None, required=False):
pyproject_file = path
if os.path.isdir(path):
pyproject_file = os.path.join(path, "pyproject.toml")
Expand All @@ -703,7 +703,7 @@ def poetry_install_step(path, poetry_args=[], prefix=None, required=False):
"poetry configuration not found: {}".format(pyproject_file)
)
else:
step("poetry", runtime, path, poetry_args, prefix)
step("poetry", runtime, path, poetry_extra_args, prefix)
hash(pyproject_file)
pyproject_path = os.path.dirname(pyproject_file)
poetry_lock_file = os.path.join(pyproject_path, "poetry.lock")
Expand Down Expand Up @@ -807,7 +807,7 @@ def commands_step(path, commands):
prefix = claim.get("prefix_in_zip")
pip_requirements = claim.get("pip_requirements")
poetry_install = claim.get("poetry_install")
additional_poetry_arg = claim.get("additional_poetry_args", [])
poetry_extra_args = claim.get("poetry_extra_args", [])
npm_requirements = claim.get("npm_package_json")
runtime = claim.get("runtime", query.runtime)

Expand All @@ -832,7 +832,7 @@ def commands_step(path, commands):
poetry_install_step(
path,
prefix=prefix,
poetry_args=additional_poetry_arg,
poetry_extra_args=poetry_extra_args,
required=True,
)

Expand Down Expand Up @@ -907,11 +907,11 @@ def execute(self, build_plan, zip_stream, query):
(
runtime,
path,
poetry_args,
poetry_extra_args,
prefix,
) = action[1:]
log.info("Poetry arguments: %s", poetry_args)
with install_poetry_dependencies(query, path, poetry_args) as rd:
log.info("poetry_extra_args: %s", poetry_extra_args)
with install_poetry_dependencies(query, path, poetry_extra_args) as rd:
if rd:
if pf:
self._zip_write_with_filter(zs, pf, rd, prefix, timestamp=0)
Expand Down Expand Up @@ -1106,7 +1106,7 @@ def install_pip_requirements(query, requirements_file, tmp_dir):


@contextmanager
def install_poetry_dependencies(query, path, poetry_args):
def install_poetry_dependencies(query, path, poetry_extra_args):
# TODO:
# 1. Emit files instead of temp_dir

Expand Down Expand Up @@ -1204,7 +1204,7 @@ def copy_file_to_target(file, temp_dir):
"--output",
"requirements.txt",
"--with-credentials",
] + poetry_args
] + poetry_extra_args

poetry_commands = [
[
Expand Down

0 comments on commit c32a87c

Please sign in to comment.