Merge pull request #316 from CloudVE/fix_tox_syntax

Fix tox syntax and branch references

.github/workflows/integration.yaml

@@ -4,10 +4,10 @@ name: Integration tests
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
     branches:
-      - master
+      - main
   workflow_dispatch: {}
 
 jobs:

README.rst

@@ -13,7 +13,7 @@ Build Status Tests
    :target: https://github.com/CloudVE/cloudbridge/actions/
    :alt: Integration Tests
 
-.. image:: https://codecov.io/gh/CloudVE/cloudbridge/branch/master/graph/badge.svg
+.. image:: https://codecov.io/gh/CloudVE/cloudbridge/branch/main/graph/badge.svg
    :target: https://codecov.io/gh/CloudVE/cloudbridge
    :alt: Code Coverage
 

docs/topics/testing.rst

@@ -77,8 +77,8 @@ Alternatively you can run the mock tests through tox.
 ``tox -e "py27-mock"``
 
 .. _design goals: https://github.com/CloudVE/cloudbridge/
-   blob/master/README.rst
+   blob/main/README.rst
 .. _tox: https://tox.readthedocs.org/en/latest/
-.. _ProviderList: https://github.com/CloudVE/cloudbridge/blob/master/
+.. _ProviderList: https://github.com/CloudVE/cloudbridge/blob/main/
    cloudbridge/cloud/factory.py#L15
 .. _moto: https://github.com/spulec/moto

tox.ini

@@ -23,11 +23,11 @@ setenv =
     COVERAGE_FILE=.coverage.{envname}
 passenv =
     PYTHONUNBUFFERED
-    aws: CB_IMAGE_AWS CB_VM_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
-    azure: CB_IMAGE_AZURE CB_VM_TYPE_AZURE AZURE_SUBSCRIPTION_ID AZURE_CLIENT_ID AZURE_SECRET AZURE_TENANT AZURE_REGION_NAME AZURE_RESOURCE_GROUP AZURE_STORAGE_ACCOUNT AZURE_VM_DEFAULT_USER_NAME AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
-    gcp: CB_IMAGE_GCP CB_VM_TYPE_GCP CB_PLACEMENT_GCP GCP_DEFAULT_REGION GCP_DEFAULT_ZONE GCP_PROJECT_NAME GCP_SERVICE_CREDS_FILE GCP_SERVICE_CREDS_DICT
-    openstack:  CB_IMAGE_OS CB_VM_TYPE_OS CB_PLACEMENT_OS OS_AUTH_URL OS_PASSWORD OS_PROJECT_NAME OS_TENANT_NAME OS_USERNAME OS_REGION_NAME OS_USER_DOMAIN_NAME OS_PROJECT_DOMAIN_NAME NOVA_SERVICE_NAME OS_APPLICATION_CREDENTIAL_ID OS_APPLICATION_CREDENTIAL_SECRET
-    mock: CB_IMAGE_AWS CB_VM_TYPE_AWS CB_PLACEMENT_AWS AWS_ACCESS_KEY AWS_SECRET_KEY
+    aws: CB_IMAGE_AWS,CB_VM_TYPE_AWS,CB_PLACEMENT_AWS,AWS_ACCESS_KEY,AWS_SECRET_KEY
+    azure: CB_IMAGE_AZURE,CB_VM_TYPE_AZURE,AZURE_SUBSCRIPTION_ID,AZURE_CLIENT_ID,AZURE_SECRET,AZURE_TENANT,AZURE_REGION_NAME,AZURE_RESOURCE_GROUP,AZURE_STORAGE_ACCOUNT,AZURE_VM_DEFAULT_USER_NAME,AZURE_PUBLIC_KEY_STORAGE_TABLE_NAME
+    gcp: CB_IMAGE_GCP,CB_VM_TYPE_GCP,CB_PLACEMENT_GCP,GCP_DEFAULT_REGION,GCP_DEFAULT_ZONE,GCP_PROJECT_NAME,GCP_SERVICE_CREDS_FILE,GCP_SERVICE_CREDS_DICT
+    openstack: CB_IMAGE_OS,CB_VM_TYPE_OS,CB_PLACEMENT_OS,OS_AUTH_URL,OS_PASSWORD,OS_PROJECT_NAME,OS_TENANT_NAME,OS_USERNAME,OS_REGION_NAME,OS_USER_DOMAIN_NAME,OS_PROJECT_DOMAIN_NAME,NOVA_SERVICE_NAME,OS_APPLICATION_CREDENTIAL_ID,OS_APPLICATION_CREDENTIAL_SECRET
+    mock: CB_IMAGE_AWS,CB_VM_TYPE_AWS,CB_PLACEMENT_AWS,AWS_ACCESS_KEY,AWS_SECRET_KEY
 deps =
     -rrequirements.txt
     coverage<5