Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ dist-bin/localstack build: $(VENV_ACTIVATE) main.py
$(PYINSTALLER_ARGS) -n localstack \
--hidden-import cookiecutter.main \
--hidden-import cookiecutter.extensions \
--hidden-import localstack.dev.run.configurators \
--hidden-import localstack.pro.core.plugins \
--hidden-import localstack.pro.core.cli.localstack \
--hidden-import localstack.pro.core.extensions.plugins \
--hidden-import localstack_cli.cli.core_plugin \
--hidden-import localstack_cli.pro.core.cli.localstack \
--hidden-import localstack_cli.runtime \
--hidden-import localstack_cli.runtime.hooks \
--hidden-import localstack_cli.runtime.exceptions \
--hidden-import localstack_cli.pro.core.plugins \
--hidden-import localstack_cli.pro.core.bootstrap.extensions.bootstrap \
--hidden-import localstack_cli.utils.analytics.metadata \
--collect-all=rich \
--copy-metadata localstack_ext \
--collect-data localstack.pro.core \
--copy-metadata localstack \
--additional-hooks-dir hooks

dist-dir/localstack: PYINSTALLER_ARGS=--distpath=dist-dir
Expand All @@ -47,4 +50,3 @@ clean-venv:
rm -rf $(VENV_DIR)

.PHONY: all build clean clean-venv

4 changes: 4 additions & 0 deletions hooks/hook-localstack.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
from PyInstaller.utils.hooks import copy_metadata

# make sure to add the entrypoints data for localstack (for plux plugin discovery)
datas = copy_metadata('localstack')
4 changes: 0 additions & 4 deletions hooks/hook-localstack_core.py

This file was deleted.

2 changes: 1 addition & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
freeze_support()

os.environ["SKIP_PATCH_MOTO_ACCOUNT_ID"] = "1"
from localstack.cli import main
from localstack_cli.cli import main

if __name__ == '__main__':
main.main()
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
pyinstaller
localstack==4.13.1
localstack==4.13.2.dev36
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: How do you plan to get rid of this exact pin here to make sure that this is using the proper version after the next release of localstack?

Copy link
Member Author

@silv-io silv-io Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll change the release pipeline in pro to publish the standalone cli + make the pyinstaller build depend on it.

For this change we'd have two options: revert this to 4.13.1, but then the build will fail on main, or keep this change until the actual next localstack release comes out.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But wouldn't this break the pipeline here in main after the merge of this PR?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've edited the message before I got your response. Is this a response to what I planned before (reverting) or to what I've changed it to?

Copy link
Member Author

@silv-io silv-io Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If it's to the new one, how would it break on main if we keep the PR as-is? 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am confused by your message edits to be honest. So will this PR be merged at the time of the release? If so how does this play in the grand scheme of our release action?

If the PR is merged now, are you okay with breaking main?

Up to you, just want to make sure you are aware of the consequences / have a plan. 😛

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll merge this now to match up with the latest dev release state of localstack. The next release will automatically change this to not be on the dev release anymore 👍🏼

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, perfect, thanks!

cookiecutter