Update master

_data/xcodes.yml

@@ -1,4 +1,63 @@
 osx_images:
+  - image: xcode12.2
+    xcode: "12.2"
+    osx_version: "10.15.7"
+    xcode_full_version: "12.2"
+    xcode_build_version: "12B5018i"
+    image_publish_date: 2020-10-06
+    sdks:
+      - iphoneos14.2
+      - iphonesimulator14.2
+      - macosx11.0
+      - appletvos14.2
+      - appletvsimulator14.2
+      - watchos7.1
+      - watchsimulator7.1
+    simulators:
+      - iOS 10.3
+      - iOS 11.0
+      - iOS 11.1
+      - iOS 11.2
+      - iOS 11.3
+      - iOS 11.4
+      - iOS 12.0
+      - iOS 12.1
+      - iOS 12.2
+      - iOS 12.4
+      - iOS 13.0
+      - iOS 13.1
+      - iOS 13.2
+      - iOS 13.3
+      - iOS 13.4
+      - iOS 13.5
+      - iOS 14.0 
+      - tvOS 10.2 
+      - tvOS 11.0
+      - tvOS 11.1
+      - tvOS 11.2
+      - tvOS 11.3
+      - tvOS 11.4
+      - tvOS 12.0
+      - tvOS 12.1
+      - tvOS 12.2
+      - tvOS 12.4
+      - tvOS 13.0
+      - tvOS 13.2
+      - tvOS 13.3
+      - tvOS 13.4
+      - tvOS 14.0      
+      - watchOS 3.2
+      - watchOS 4.0
+      - watchOS 4.1
+      - watchOS 4.2
+      - watchOS 5.0 
+      - watchOS 5.1
+      - watchOS 5.2
+      - watchOS 5.3
+      - watchOS 6.1
+      - watchOS 6.2
+      - watchOS 7.0  
+    jdk: "14.0.2"
   - image: xcode12u 
     xcode: "12 (Universal)"
     osx_version: "10.15.5"
@@ -15,14 +74,14 @@ osx_images:
     jdk: "14.0.1"  
   - image: xcode12
     xcode: "12"
-    osx_version: "10.15.5"
-    xcode_full_version: "12.0"
-    xcode_build_version: "12A8189h"
-    image_publish_date: 2020-08-24
+    osx_version: "10.15.7"
+    xcode_full_version: "12.0.1"
+    xcode_build_version: "12A7300"
+    image_publish_date: 2020-10-06
     sdks:
       - iphoneos14.0
       - iphonesimulator14.0
-      - macosx11.0
+      - macosx10.15
       - appletvos14.0
       - appletvsimulator14.0
       - watchos7

_includes/deploy/providers/ecr.md

@@ -0,0 +1,45 @@
+{% unless include.minimal == false %}
+For a minimal configuration, add the following to your `.travis.yml`:
+
+```yaml
+deploy:
+  provider: ecr
+  access_key_id: <encrypted access_key_id>
+  secret_access_key: <encrypted secret_access_key>
+  source: <source>
+  target: <target>
+  edge: true # opt in to dpl v2
+```
+{: data-file=".travis.yml"}
+
+
+
+{{ include.content }}
+{% endunless %}
+
+## Status
+
+Support for deployments to AWS ECR is in **alpha**. Please see [Maturity Levels](/user/deployment-v2#maturity-levels) for details.
+## Known options
+
+Use the following options to further configure the deployment.
+
+| `access_key_id` | AWS access key &mdash; **required**, **secret**, type: string |
+| `secret_access_key` | AWS secret access key &mdash; **required**, **secret**, type: string |
+| `account_id` | AWS Account ID &mdash; type: string, note: Required if the repository is owned by a different account than the IAM user |
+| `source` | Image to push &mdash; **required**, type: string, note: can be the id or the name and optional tag (e.g. mysql:5.6) |
+| `target` | Comma separated list of partial repository names to push to &mdash; **required**, type: string |
+| `region` | Comma separated list of regions to push to &mdash; type: string, default: `us-east-1` |
+
+### Shared options
+
+| `cleanup` | Clean up build artifacts from the Git working directory before the deployment &mdash; type: boolean |
+| `run` | Commands to execute after the deployment finished successfully &mdash; type: string or array of strings |
+
+## Environment variables
+
+All options can be given as environment variables if prefixed with `AWS_`.
+
+For example, `access_key_id` can be given as `AWS_ACCESS_KEY_ID=<access_key_id>`.
+
+{% include deploy/secrets.md name="access_key_id" env_name="AWS_ACCESS_KEY_ID" %}

user/languages/python.md

@@ -158,8 +158,6 @@ If you're using tox to test your code against multiple versions of Python, you h
   * use `language: generic` and manually install the Python versions you're interested in before running tox (without the manual installation, tox will only have access to the default Ubuntu Python versions - 2.7.12 and 3.5.1 for Xenial)
   * use `language: python` and a build matrix that uses a different version of Python for each branch (you can specify the Python version by using the `python` key). This will ensure the versions you're interested in are installed and parallelizes your workload.
 
-A good example of a `travis.yml` that runs tox using a Travis build matrix is [twisted/klein](https://github.com/twisted/klein/blob/master/.travis.yml).
-
 ## Running Python tests on multiple Operating Systems
 
 Sometimes it is necessary to ensure that software works the same across multiple Operating Systems.  This following `.travis.yml` file will execute parallel test runs on Linux, macOS, and Windows.