Merge branch 'main' into merge-back/1.29.0

aws · Apr 26, 2021 · 5c9afa1 · 5c9afa1
2 parents 41df200 + f25acab
commit 5c9afa1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/python.md b/gh-pages/content/user-guides/lib-author/configuration/targets/python.md
@@ -58,11 +58,11 @@ are accepted by `jsii-pacmak`, and are translated according to the following tab
 
 | Source Version (`npm`) | Python Version ([PEP-440]) | Notes                            |
 | ---------------------- | -------------------------- | -------------------------------- |
-| `X.Y.Z.dev.N`          | `X.Y.Z.devN`               | Development, iteration `N`.      |
-| `X.Y.Z.pre.N`          | `X.Y.Z.devN`               | Development, iteration `N`       |
-| `X.Y.Z.alpha.N`        | `X.Y.Z.aN`                 | Alpha release, iteration `N`     |
-| `X.Y.Z.beta.N`         | `X.Y.Z.bN`                 | Beta release, iteration `N`      |
-| `X.Y.Z.rc.N`           | `X.Y.Z.rcN`                | Release candidate, iteration `N` |
+| `X.Y.Z-dev.N`          | `X.Y.Z.devN`               | Development, iteration `N`.      |
+| `X.Y.Z-pre.N`          | `X.Y.Z.devN`               | Development, iteration `N`       |
+| `X.Y.Z-alpha.N`        | `X.Y.Z.aN`                 | Alpha release, iteration `N`     |
+| `X.Y.Z-beta.N`         | `X.Y.Z.bN`                 | Beta release, iteration `N`      |
+| `X.Y.Z-rc.N`           | `X.Y.Z.rcN`                | Release candidate, iteration `N` |
 
 [semver]: https://semver.org/spec/v2.0.0.html
 [pep-440]: https://www.python.org/dev/peps/pep-0440/#pre-releases
diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
@@ -1,6 +1,6 @@
 black~=20.8b1
 mypy==0.812
-pip~=21.0
+pip~=21.1
 pytest~=6.2
 pytest-mypy~=0.8
 setuptools~=56.0