From 8b9ac0557b36427dad706c3bb16200e09dac2702 Mon Sep 17 00:00:00 2001 From: Kenneth Lyons Date: Wed, 30 Sep 2020 21:04:09 -0700 Subject: [PATCH] Remove a few remaining mentions of the develop branch --- CONTRIBUTING.md | 2 +- azure-pipelines.yml | 2 +- doc/source/installation.rst | 4 ++-- tools/setupHelpers.py | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 461e9b14..21e11727 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,7 +6,7 @@ Please use the following guidelines when preparing changes: ## Submitting Code Changes -* The preferred method for submitting changes is by github pull request against the "develop" branch. +* The preferred method for submitting changes is by github pull request against the "master" branch. * Pull requests should include only a focused and related set of changes. Mixed features and unrelated changes may be rejected. * For major changes, it is recommended to discuss your plans on the mailing list or in a github issue before putting in too much effort. * The following deprecations are being considered by the maintainers diff --git a/azure-pipelines.yml b/azure-pipelines.yml index eb379119..cf36c166 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -16,7 +16,7 @@ pr: variables: OFFICIAL_REPO: 'pyqtgraph/pyqtgraph' - DEFAULT_MERGE_BRANCH: 'develop' + DEFAULT_MERGE_BRANCH: 'master' disable.coverage.autogenerate: 'true' stages: diff --git a/doc/source/installation.rst b/doc/source/installation.rst index fd9f5288..9cf276d7 100644 --- a/doc/source/installation.rst +++ b/doc/source/installation.rst @@ -49,9 +49,9 @@ To get access to the very latest features and bugfixes you have three choices: 2. Directly install from GitHub repo:: - $ pip install git+git://github.com/pyqtgraph/pyqtgraph.git@develop + $ pip install git+git://github.com/pyqtgraph/pyqtgraph.git@master - You can change ``develop`` of the above command to the branch name or the + You can change ``master`` of the above command to the branch name or the commit you prefer. 3. You can simply place the pyqtgraph folder someplace importable, such as diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py index 6ebbfa46..6a9b862b 100644 --- a/tools/setupHelpers.py +++ b/tools/setupHelpers.py @@ -255,11 +255,11 @@ def checkMergeSize( sourceRepo = '..' if targetBranch is None: - if sourceBranch == 'develop': - targetBranch = 'develop' + if sourceBranch == 'master': + targetBranch = 'master' targetRepo = 'https://github.com/pyqtgraph/pyqtgraph.git' else: - targetBranch = 'develop' + targetBranch = 'master' targetRepo = '..' workingDir = '__merge-test-clone'