Merge pull request #289 from bluetech/pytest-branch

tox,ci: change pytestmaster -> pytestmain

Author: bluetech

.github/workflows/main.yml

@@ -28,7 +28,7 @@ jobs:
           # Commented stuff is in preparation for that.
           # "ubuntu-py35",
           # "ubuntu-py36",
-          # "ubuntu-py36-pytestmaster",
+          # "ubuntu-py36-pytestmain",
           # "ubuntu-py37",
           # "ubuntu-py38",
           # "ubuntu-pypy3",
@@ -63,10 +63,10 @@ jobs:
           #   python: "3.6"
           #   os: ubuntu-latest
           #   tox_env: "py36"
-          # - name: "ubuntu-py36-pytestmaster"
+          # - name: "ubuntu-py36-pytestmain"
           #   python: "3.6"
           #   os: ubuntu-latest
-          #   tox_env: "py36-pytestmaster"
+          #   tox_env: "py36-pytestmain"
           # - name: "ubuntu-py37"
           #   python: "3.7"
           #   os: ubuntu-latest

.travis.yml

@@ -20,9 +20,9 @@ jobs:
     - python: '3.8'
       env: TOXENV=py38-coverage
     - python: '3.6'
-      env: TOXENV=py36-pytestmaster-coverage
+      env: TOXENV=py36-pytestmain-coverage
     - python: '3.7'
-      env: TOXENV=py37-pytestmaster-coverage
+      env: TOXENV=py37-pytestmain-coverage
 
     - stage: deploy
       python: '3.6'

tox.ini

@@ -12,7 +12,7 @@ setenv=
 extras=testing
 deps=
   coverage: coverage
-  pytestmaster: git+https://github.com/pytest-dev/pytest.git@master
+  pytestmain: git+https://github.com/pytest-dev/pytest.git@main
 
 [testenv:benchmark]
 commands=pytest {posargs:testing/benchmark.py}