Merge pull request #1386 from ixjlyons/dev-to-master
Remove a few remaining mentions of the develop branch
This commit is contained in:
commit
0a8ad6b1aa
@ -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
|
||||
|
@ -16,7 +16,7 @@ pr:
|
||||
|
||||
variables:
|
||||
OFFICIAL_REPO: 'pyqtgraph/pyqtgraph'
|
||||
DEFAULT_MERGE_BRANCH: 'develop'
|
||||
DEFAULT_MERGE_BRANCH: 'master'
|
||||
disable.coverage.autogenerate: 'true'
|
||||
|
||||
stages:
|
||||
|
@ -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
|
||||
|
@ -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'
|
||||
|
Loading…
Reference in New Issue
Block a user