Merge branch 'mingrammer:master' into master

.github/workflows/test.yml

@@ -18,17 +18,17 @@ jobs:
   test:
     strategy:
       matrix:
-        python: ["3.7", "3.8", "3.9", "3.10", "3.11"]
+        python: ["3.9", "3.10", "3.11"]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
       - name: Setup Graphviz
         uses: ts-graphviz/setup-graphviz@v1
       - name: Install poetry
-        run: pip install poetry
+        run: curl -sSL https://install.python-poetry.org | python3 -
       - name: Run all tests
         run: |
           poetry install

README.md

@@ -41,7 +41,7 @@ Diagrams lets you draw the cloud system architecture **in Python code**. It was
 
 ## Getting Started
 
-It requires **Python 3.6** or higher, check your Python version first.
+It requires **Python 3.7** or higher, check your Python version first.
 
 It uses [Graphviz](https://www.graphviz.org/) to render the diagram, so you need to [install Graphviz](https://graphviz.gitlab.io/download/) to use **diagrams**. After installing graphviz (or already have it), install the **diagrams**.
 
@@ -76,7 +76,7 @@ To contribute to diagram, check out [contribution guidelines](CONTRIBUTING.md).
 
 ## Who uses it?
 
-[GitPitch](https://gitpitch.github.io/gitpitch) is the perfect slide deck solution for Tech Conferences, Training, Developer Advocates, and Educators. Diagrams is now available as a dedicated [Cloud Diagram Markdown Widget](https://gitpitch.github.io/gitpitch/#/diagrams/cloud-architecture) so you can use Diagrams directly on any slide for conferences, meetups, and training.
+[Apache Airflow](https://github.com/apache/airflow) is the most popular data workflow Orchestrator. Airflow uses Diagrams to generate architecture diagrams in their documentation.
 
 [Cloudiscovery](https://github.com/Cloud-Architects/cloudiscovery) helps you to analyze resources in your cloud (AWS/GCP/Azure/Alibaba/IBM) account. It allows you to create a diagram of analyzed cloud resource map based on this Diagrams library, so you can draw your existing cloud infrastructure with Cloudiscovery.
 

diagrams/azure/compute.py

@@ -40,6 +40,10 @@ class CloudsimpleVirtualMachines(_Compute):
     _icon = "cloudsimple-virtual-machines.png"
 
 
+class ContainerApps(_Compute):
+    _icon = "container-apps.png"
+
+
 class ContainerInstances(_Compute):
     _icon = "container-instances.png"
 

diagrams/azure/network.py

@@ -72,6 +72,10 @@ class OnPremisesDataGateways(_Network):
     _icon = "on-premises-data-gateways.png"
 
 
+class PrivateEndpoint(_Network):
+    _icon = "private-endpoint.png"
+
+
 class PublicIpAddresses(_Network):
     _icon = "public-ip-addresses.png"
 

diagrams/gcp/api.py

@@ -12,6 +12,10 @@ class APIGateway(_API):
     _icon = "api-gateway.png"
 
 
+class Apigee(_API):
+    _icon = "apigee.png"
+
+
 class Endpoints(_API):
     _icon = "endpoints.png"
 

diagrams/gcp/operations.py

@@ -8,6 +8,10 @@ class _Operations(_GCP):
     _icon_dir = "resources/gcp/operations"
 
 
+class Logging(_Operations):
+    _icon = "logging.png"
+
+
 class Monitoring(_Operations):
     _icon = "monitoring.png"
 

diagrams/generic/virtualization.py

@@ -8,6 +8,10 @@ class _Virtualization(_Generic):
     _icon_dir = "resources/generic/virtualization"
 
 
+class Qemu(_Virtualization):
+    _icon = "qemu.png"
+
+
 class Virtualbox(_Virtualization):
     _icon = "virtualbox.png"
 

diagrams/onprem/analytics.py

@@ -72,6 +72,10 @@ class Tableau(_Analytics):
     _icon = "tableau.png"
 
 
+class Trino(_Analytics):
+    _icon = "trino.png"
+
+
 # Aliases
 
 PowerBI = Powerbi

diagrams/programming/framework.py

@@ -48,6 +48,10 @@ class Micronaut(_Framework):
     _icon = "micronaut.png"
 
 
+class Quarkus(_Framework):
+    _icon = "quarkus.png"
+
+
 class Rails(_Framework):
     _icon = "rails.png"
 

diagrams/saas/alerting.py

@@ -16,6 +16,10 @@ class Opsgenie(_Alerting):
     _icon = "opsgenie.png"
 
 
+class Pagerduty(_Alerting):
+    _icon = "pagerduty.png"
+
+
 class Pushover(_Alerting):
     _icon = "pushover.png"
 
@@ -24,7 +28,4 @@ class Xmatters(_Alerting):
     _icon = "xmatters.png"
 
 
-class Pagerduty(_Alerting):
-    _icon = "pagerduty.png"
-    
 # Aliases

docs/nodes/azure.md

@@ -71,6 +71,9 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/compute/cloudsimple-virtual-machines.png" alt="CloudsimpleVirtualMachines" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.CloudsimpleVirtualMachines**
 
+<img width="30" src="/img/resources/azure/compute/container-apps.png" alt="ContainerApps" style="float: left; padding-right: 5px;" >
+**diagrams.azure.compute.ContainerApps**
+
 <img width="30" src="/img/resources/azure/compute/container-instances.png" alt="ContainerInstances" style="float: left; padding-right: 5px;" >
 **diagrams.azure.compute.ContainerInstances**
 
@@ -572,6 +575,9 @@ Node classes list of azure provider.
 <img width="30" src="/img/resources/azure/network/on-premises-data-gateways.png" alt="OnPremisesDataGateways" style="float: left; padding-right: 5px;" >
 **diagrams.azure.network.OnPremisesDataGateways**
 
+<img width="30" src="/img/resources/azure/network/private-endpoint.png" alt="PrivateEndpoint" style="float: left; padding-right: 5px;" >
+**diagrams.azure.network.PrivateEndpoint**
+
 <img width="30" src="/img/resources/azure/network/public-ip-addresses.png" alt="PublicIpAddresses" style="float: left; padding-right: 5px;" >
 **diagrams.azure.network.PublicIpAddresses**
 

docs/nodes/gcp.md

@@ -44,6 +44,9 @@ Node classes list of gcp provider.
 <img width="30" src="/img/resources/gcp/api/api-gateway.png" alt="APIGateway" style="float: left; padding-right: 5px;" >
 **diagrams.gcp.api.APIGateway**
 
+<img width="30" src="/img/resources/gcp/api/apigee.png" alt="Apigee" style="float: left; padding-right: 5px;" >
+**diagrams.gcp.api.Apigee**
+
 <img width="30" src="/img/resources/gcp/api/endpoints.png" alt="Endpoints" style="float: left; padding-right: 5px;" >
 **diagrams.gcp.api.Endpoints**
 
@@ -278,6 +281,9 @@ Node classes list of gcp provider.
 ## gcp.operations
 
 
+<img width="30" src="/img/resources/gcp/operations/logging.png" alt="Logging" style="float: left; padding-right: 5px;" >
+**diagrams.gcp.operations.Logging**
+
 <img width="30" src="/img/resources/gcp/operations/monitoring.png" alt="Monitoring" style="float: left; padding-right: 5px;" >
 **diagrams.gcp.operations.Monitoring**
 

docs/nodes/generic.md

@@ -98,6 +98,9 @@ Node classes list of generic provider.
 ## generic.virtualization
 
 
+<img width="30" src="/img/resources/generic/virtualization/qemu.png" alt="Qemu" style="float: left; padding-right: 5px;" >
+**diagrams.generic.virtualization.Qemu**
+
 <img width="30" src="/img/resources/generic/virtualization/virtualbox.png" alt="Virtualbox" style="float: left; padding-right: 5px;" >
 **diagrams.generic.virtualization.Virtualbox**
 

docs/nodes/onprem.md

@@ -65,6 +65,9 @@ Node classes list of onprem provider.
 <img width="30" src="/img/resources/onprem/analytics/tableau.png" alt="Tableau" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.analytics.Tableau**
 
+<img width="30" src="/img/resources/onprem/analytics/trino.png" alt="Trino" style="float: left; padding-right: 5px;" >
+**diagrams.onprem.analytics.Trino**
+
 ## onprem.auth
 
 

docs/nodes/programming.md

@@ -113,6 +113,9 @@ Node classes list of programming provider.
 <img width="30" src="/img/resources/programming/framework/micronaut.png" alt="Micronaut" style="float: left; padding-right: 5px;" >
 **diagrams.programming.framework.Micronaut**
 
+<img width="30" src="/img/resources/programming/framework/quarkus.png" alt="Quarkus" style="float: left; padding-right: 5px;" >
+**diagrams.programming.framework.Quarkus**
+
 <img width="30" src="/img/resources/programming/framework/rails.png" alt="Rails" style="float: left; padding-right: 5px;" >
 **diagrams.programming.framework.Rails**
 

docs/nodes/saas.md

@@ -14,17 +14,18 @@ Node classes list of saas provider.
 <img width="30" src="/img/resources/saas/alerting/opsgenie.png" alt="Opsgenie" style="float: left; padding-right: 5px;" >
 **diagrams.saas.alerting.Opsgenie**
 
+<img width="30" src="/img/resources/saas/alerting/pagerduty.png" alt="Pagerduty" style="float: left; padding-right: 5px;" >
+**diagrams.saas.alerting.Pagerduty**
+
 <img width="30" src="/img/resources/saas/alerting/pushover.png" alt="Pushover" style="float: left; padding-right: 5px;" >
 **diagrams.saas.alerting.Pushover**
 
 <img width="30" src="/img/resources/saas/alerting/xmatters.png" alt="Xmatters" style="float: left; padding-right: 5px;" >
 **diagrams.saas.alerting.Xmatters**
 
-<img width="30" src="/img/resources/saas/alerting/pagerduty.png" alt="Pagerduty" style="float: left; padding-right: 5px;" >
-**diagrams.saas.alerting.Pagerduty**
-
 ## saas.analytics
 
+
 <img width="30" src="/img/resources/saas/analytics/dataform.png" alt="Dataform" style="float: left; padding-right: 5px;" >
 **diagrams.saas.analytics.Dataform**
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "diagrams"
-version = "0.23.3"
+version = "0.23.4"
 description = "Diagram as Code"
 license = "MIT"
 authors = ["mingrammer <mingrammer@gmail.com>"]
@@ -13,7 +13,6 @@ include = ["resources/**/*"]
 python = "^3.7"
 graphviz = ">=0.13.2,<0.21.0"
 jinja2 = ">=2.10,<4.0"
-contextvars = { version = "^2.4", python = "~3.6" }
 typed-ast = "^1.5.4"
 
 [tool.poetry.dev-dependencies]