ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1386 from ixjlyons/dev-to-master

Browse Source 
Remove a few remaining mentions of the develop branch
This commit is contained in:
Kyle Sunden 2020-09-30 23:30:47 -05:00 committed by GitHub
commit 0a8ad6b1aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTING.md
View File

@ -6,7 +6,7 @@ Please use the following guidelines when preparing changes:
## Submitting Code 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. * 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. * 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 * The following deprecations are being considered by the maintainers

2
azure-pipelines.yml
View File

@ -16,7 +16,7 @@ pr:
variables: variables:
OFFICIAL_REPO: 'pyqtgraph/pyqtgraph' OFFICIAL_REPO: 'pyqtgraph/pyqtgraph'
DEFAULT_MERGE_BRANCH: 'develop' DEFAULT_MERGE_BRANCH: 'master'
disable.coverage.autogenerate: 'true' disable.coverage.autogenerate: 'true'
stages: stages:

4
doc/source/installation.rst
View File

@ -49,9 +49,9 @@ To get access to the very latest features and bugfixes you have three choices:
2. Directly install from GitHub repo:: 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. commit you prefer.
3. You can simply place the pyqtgraph folder someplace importable, such as 3. You can simply place the pyqtgraph folder someplace importable, such as

6
tools/setupHelpers.py
View File

@ -255,11 +255,11 @@ def checkMergeSize(
sourceRepo = '..' sourceRepo = '..'
if targetBranch is None: if targetBranch is None:
if sourceBranch == 'develop': if sourceBranch == 'master':
targetBranch = 'develop' targetBranch = 'master'
targetRepo = 'https://github.com/pyqtgraph/pyqtgraph.git' targetRepo = 'https://github.com/pyqtgraph/pyqtgraph.git'
else: else:
targetBranch = 'develop' targetBranch = 'master'
targetRepo = '..' targetRepo = '..'
workingDir = '__merge-test-clone' workingDir = '__merge-test-clone'