Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix package conflict by moving localstack dep to dev extra #73

Merged
merged 1 commit into from
Jul 16, 2024
Merged

fix package conflict by moving localstack dep to dev extra #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions aws-replicator/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ install_requires =
# TODO: currently requires a version pin, see note in auth_proxy.py
botocore>=1.29.151
flask
localstack
localstack-client
localstack-ext
xmltodict
# TODO: refactor the use of http2_server
hypercorn
Expand All @@ -37,6 +35,8 @@ install_requires =
[options.extras_require]
test =
apispec
localstack-core
localstack-ext
openapi-spec-validator
pyproject-flake8
pytest
Expand Down
3 changes: 1 addition & 2 deletions diagnosis-viewer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ venv: $(VENV_ACTIVATE)
$(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -18,7 +17,7 @@ clean:
rm -rf *.egg-info/

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
5 changes: 4 additions & 1 deletion diagnosis-viewer/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ long_description_content_type = text/markdown; charset=UTF-8
zip_safe = False
packages = find:
install_requires =
localstack>=1.4
diapretty

[options.extras_require]
dev =
localstack-core>=1.4

[options.entry_points]
localstack.extensions =
diagnosis-viewer = diagnosis_viewer.extension:DiagnosisViewerExtension
3 changes: 1 addition & 2 deletions hello-world/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install --upgrade black isort pyproject-flake8 flake8-black flake8-isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -25,7 +24,7 @@ format: ## Run black and isort code formatter
$(VENV_RUN); python -m isort helloworld; python -m black helloworld

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
6 changes: 4 additions & 2 deletions hello-world/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ author_email = thomas@localstack.cloud
[options]
zip_safe = False
packages = find:
install_requires =
localstack>=1.0

[options.extras_require]
dev =
localstack-core>=1.0

[options.entry_points]
localstack.extensions =
Expand Down
3 changes: 1 addition & 2 deletions httpbin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install --upgrade black isort pyproject-flake8 flake8-black flake8-isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -25,7 +24,7 @@ format: venv
$(VENV_RUN); python -m isort .; python -m black .

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
5 changes: 4 additions & 1 deletion httpbin/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ long_description_content_type = text/markdown; charset=UTF-8
zip_safe = False
packages = find:
install_requires =
localstack>=2.2
# requirements for vendored httpbin
Flask
MarkupSafe
Expand All @@ -24,6 +23,10 @@ install_requires =
gevent
flasgger

[options.extras_require]
dev =
localstack-core>=2.2

[options.entry_points]
localstack.extensions =
httpbin = localstack_httpbin.extension:HttpbinExtension
Expand Down
3 changes: 1 addition & 2 deletions mailhog/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install --upgrade black isort pyproject-flake8 flake8-black flake8-isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -25,7 +24,7 @@ format: ## Run black and isort code formatter
$(VENV_RUN); python -m isort mailhog; python -m black mailhog

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
6 changes: 4 additions & 2 deletions mailhog/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ long_description_content_type = text/markdown; charset=UTF-8
[options]
zip_safe = False
packages = find:
install_requires =
localstack>=2.2

[options.extras_require]
dev =
localstack-core>=2.2

[options.entry_points]
localstack.extensions =
Expand Down
3 changes: 1 addition & 2 deletions miniflare/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install --upgrade black isort pyproject-flake8 flake8-black flake8-isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -25,7 +24,7 @@ format: ## Run black and isort code formatter
$(VENV_RUN); python -m isort .; python -m black .

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
6 changes: 4 additions & 2 deletions miniflare/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ author_email = waldemar@localstack.cloud
[options]
zip_safe = False
packages = find:
install_requires =
localstack>=1.0.0

[options.extras_require]
dev =
localstack-core>=1.0.0

[options.entry_points]
localstack.extensions =
Expand Down
3 changes: 1 addition & 2 deletions openai/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux wheel
$(VENV_RUN); pip install --upgrade black isort pyproject-flake8 flake8-black flake8-isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -25,7 +24,7 @@ format: ## Run black and isort code formatter
$(VENV_RUN); python -m isort .; python -m black .

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
2 changes: 1 addition & 1 deletion openai/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ zip_safe = False
packages = find:
install_requires =
faker>=8.12.1
localstack>=3.1
plux>=1.3
rolo>=0.3
test_requires =
Expand All @@ -33,6 +32,7 @@ test_requires =

[options.extras_require]
dev =
localstack-core>=3.1
openai>=0.10.2,<1.0
pytest>=6.2.4
black==22.3.0
Expand Down
2 changes: 1 addition & 1 deletion stripe/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dist: venv
$(VENV_ACTIVATE); python setup.py sdist bdist_wheel

install: venv
$(VENV_ACTIVATE); python setup.py install
$(VENV_ACTIVATE); python -m pip install -e .[dev]

upload: venv dist
$(VENV_ACTIVATE); pip install --upgrade twine; twine upload dist/*
Expand Down
2 changes: 1 addition & 1 deletion stripe/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ setup_requires =
install_requires =
stevedore>=3.4
plux>=1.3
localstack>=1.0
localstack-localstripe>=1.13.8
test_requires =
pytest>=6.2.4

[options.extras_require]
dev =
localstack-core>=1.0
pytest>=6.2.4
black==22.3.0
isort==5.10.1
Expand Down
3 changes: 1 addition & 2 deletions template/{{cookiecutter.project_slug}}/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ venv: $(VENV_ACTIVATE)
$(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -18,7 +17,7 @@ clean:
rm -rf *.egg-info/

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

dist: venv
$(VENV_RUN); python setup.py sdist bdist_wheel
Expand Down
6 changes: 4 additions & 2 deletions template/{{cookiecutter.project_slug}}/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ long_description_content_type = text/markdown; charset=UTF-8
[options]
zip_safe = False
packages = find:
install_requires =
localstack>=1.0

[options.extras_require]
dev =
localstack-core>=1.0

[options.entry_points]
localstack.extensions =
Expand Down
3 changes: 1 addition & 2 deletions terraform-init/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ $(VENV_ACTIVATE): setup.py setup.cfg
test -d .venv || $(VENV_BIN) .venv
$(VENV_RUN); pip install --upgrade pip setuptools plux build
$(VENV_RUN); pip install --upgrade black isort
$(VENV_RUN); pip install -e .
touch $(VENV_DIR)/bin/activate

clean:
Expand All @@ -19,7 +18,7 @@ clean:
rm -rf *.egg-info/

install: venv
$(VENV_RUN); python setup.py develop
$(VENV_RUN); python -m pip install -e .[dev]

format: venv
$(VENV_RUN); python -m isort .; python -m black .
Expand Down
5 changes: 4 additions & 1 deletion terraform-init/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,12 @@ long_description_content_type = text/markdown; charset=UTF-8
zip_safe = False
packages = find:
install_requires =
localstack-core>=3.4
plux

[options.extras_require]
dev =
localstack-core>=3.4

[options.entry_points]
localstack.extensions =
localstack-terraform-init = localstack_terraform_init.extension:TflocalInitExtension
Expand Down
Loading