From 7b3907a9a2601499670a09a5782c72f71c0e8b94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Miguel=20Neves?= Date: Sat, 9 May 2020 18:29:56 +0100 Subject: [PATCH 1/2] remove references to zappa.io --- CHANGELOG.md | 3 +++ README.md | 15 +-------------- zappa/cli.py | 4 ++-- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41ae8b923..249d12c6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Zappa Changelog +## next +* Removed references to zappa.io + ## 0.51.0 * Lambda Layers * Cognito support diff --git a/README.md b/README.md index ba39b84a7..a82a8eaad 100644 --- a/README.md +++ b/README.md @@ -1352,10 +1352,6 @@ Out of the box, AWS sets a limit of [1000 concurrent executions](http://docs.aws To avoid this, you can file a [service ticket](https://console.aws.amazon.com/support/home#/) with Amazon to raise your limits up to the many tens of thousands of concurrent executions which you may need. This is a fairly common practice with Amazon, designed to prevent you from accidentally creating extremely expensive bug reports. So, before raising your service limits, make sure that you don't have any rogue scripts which could accidentally create tens of thousands of parallel executions that you don't want to pay for. -### Using Zappa With Docker - -If Docker is part of your team's CI, testing, or deployments, you may want to check out [this handy guide](https://blog.zappa.io/posts/simplified-aws-lambda-deployments-with-docker-and-zappa) on using Zappa with Docker. - ### Dead Letter Queues If you want to utilise [AWS Lambda's Dead Letter Queue feature](http://docs.aws.amazon.com/lambda/latest/dg/dlq.html) simply add the key `dead_letter_arn`, with the value being the complete ARN to the corresponding SNS topic or SQS queue in your `zappa_settings.json`. @@ -1477,8 +1473,6 @@ apigateway_resource_policy.json: ## Sites Using Zappa -* [Zappa.io](https://www.zappa.io) - A simple Zappa homepage -* [Zappatista!](https://blog.zappa.io) - The official Zappa blog! * [Mailchimp Signup Utility](https://github.com/sasha42/Mailchimp-utility) - A microservice for adding people to a mailing list via API. * [Zappa Slack Inviter](https://github.com/Miserlou/zappa-slack-inviter) - A tiny, server-less service for inviting new users to your Slack channel. * [Serverless Image Host](https://github.com/Miserlou/serverless-imagehost) - A thumbnailing service with Flask, Zappa and Pillow. @@ -1539,7 +1533,7 @@ If you are adding a non-trivial amount of new code, please include a functioning Please include the GitHub issue or pull request URL that has discussion related to your changes as a comment in the code ([example](https://github.com/Miserlou/Zappa/blob/fae2925431b820eaedf088a632022e4120a29f89/zappa/zappa.py#L241-L243)). This greatly helps for project maintainability, as it allows us to trace back use cases and explain decision making. Similarly, please make sure that you meet all of the requirements listed in the [pull request template](https://raw.githubusercontent.com/Miserlou/Zappa/master/.github/PULL_REQUEST_TEMPLATE.md). -Please feel free to work on any open ticket, especially any ticket marked with the "help-wanted" label. If you get stuck or want to discuss an issue further, please join [our Slack channel](https://slack.zappa.io), where you'll find a community of smart and interesting people working dilligently on hard problems. +Please feel free to work on any open ticket, especially any ticket marked with the "help-wanted" label. If you get stuck or want to discuss an issue further, please join [our Slack channel](https://zappateam.slack.com/), where you'll find a community of smart and interesting people working dilligently on hard problems. Zappa does not intend to conform to PEP8, isolate your commits so that changes to functionality with changes made by your linter. @@ -1582,13 +1576,6 @@ Zappa is currently supported by these awesome individuals and companies: Thank you very, very much! -## Merch - -
-

- Merch! -

- ## Support / Development / Training / Consulting Do you need help with.. diff --git a/zappa/cli.py b/zappa/cli.py index 88b35b0c4..2820eacba 100755 --- a/zappa/cli.py +++ b/zappa/cli.py @@ -1799,7 +1799,7 @@ def init(self, settings_file="zappa_settings.json"): click.echo("\nTo learn more, check out our project page on " + click.style("GitHub", bold=True) + " here: " + click.style("https://github.com/Miserlou/Zappa", fg="cyan", bold=True)) click.echo("and stop by our " + click.style("Slack", bold=True) + " channel here: " + - click.style("https://slack.zappa.io", fg="cyan", bold=True)) + click.style("https://zappateam.slack.com", fg="cyan", bold=True)) click.echo("\nEnjoy!,") click.echo(" ~ Team " + click.style("Zappa", bold=True) + "!") @@ -2751,7 +2751,7 @@ def shamelessly_promote(): click.echo("File bug reports on " + click.style("GitHub", bold=True) + " here: " + click.style("https://github.com/Miserlou/Zappa", fg='cyan', bold=True)) click.echo("And join our " + click.style("Slack", bold=True) + " channel here: " - + click.style("https://slack.zappa.io", fg='cyan', bold=True)) + + click.style("https://zappateam.slack.com", fg='cyan', bold=True)) click.echo("Love!,") click.echo(" ~ Team " + click.style("Zappa", bold=True) + "!") From 08c34a51b581e72cb1ebb60a35f06ca921f8f82f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Miguel=20Neves?= Date: Sun, 10 May 2020 16:10:57 +0100 Subject: [PATCH 2/2] updated toc --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index a82a8eaad..c70967869 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,6 @@ - [AWS X-Ray](#aws-x-ray) - [Globally Available Server-less Architectures](#globally-available-server-less-architectures) - [Raising AWS Service Limits](#raising-aws-service-limits) - - [Using Zappa With Docker](#using-zappa-with-docker) - [Dead Letter Queues](#dead-letter-queues) - [Unique Package ID](#unique-package-id) - [Application Load Balancer Event Source](#application-load-balancer-event-source) @@ -87,7 +86,6 @@ - [Contributing](#contributing) - [Using a Local Repo](#using-a-local-repo) - [Patrons](#patrons) -- [Merch](#merch) - [Support / Development / Training / Consulting](#support--development--training--consulting)