Skip to content

Commit

Permalink
Changed references from master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
MSeal committed Aug 18, 2020
1 parent bb8b78b commit 83f1d5d
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ install:
script:
- tox -e $TOXENV
after_success:
- test $TRAVIS_BRANCH = "master" &&
- test $TRAVIS_BRANCH = "main" &&
test $TOXENV = "py36" &&
coverage xml -i
- test $TRAVIS_BRANCH = "master" &&
- test $TRAVIS_BRANCH = "main" &&
test $TOXENV = "py36" &&
codecov
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ Your commits should be pushed to the forked repository. To verify this type
git remote -v
```

and ensure the remotes point to your GitHub. Don't work on the master branch!
and ensure the remotes point to your GitHub. Don't work on the main branch!

1. Commit changes to local repository:

Expand Down Expand Up @@ -149,6 +149,6 @@ _Note: You might want to set a reference to the main repository to fetch/merge f
git remote add upstream https://github.com/nteract/papermill
```

It's possible you will have conflicts between your repository and master. Here, `master` is meant to be synchronized with the ```upstream``` repository. GitHub has some good [documentation](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/) on merging pull requests from the command line.
It's possible you will have conflicts between your repository and main. Here, `main` is meant to be synchronized with the ```upstream``` repository. GitHub has some good [documentation](https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/) on merging pull requests from the command line.
Happy hacking on Papermill!
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
=======================================================================================================================================================================

<!---(binder links generated at https://mybinder.readthedocs.io/en/latest/howto/badges.html and compressed at https://tinyurl.com) -->
[![Travis Build Status](https://travis-ci.org/nteract/papermill.svg?branch=master)](https://travis-ci.org/nteract/papermill)
[![Azure Build Status](https://dev.azure.com/nteract/nteract/_apis/build/status/nteract.papermill?branchName=master)](https://dev.azure.com/nteract/nteract/_build/latest?definitionId=5&branchName=master)
[![image](https://codecov.io/github/nteract/papermill/coverage.svg?branch=master)](https://codecov.io/github/nteract/papermill?branch=master)
[![Travis Build Status](https://travis-ci.org/nteract/papermill.svg?branch=main)](https://travis-ci.org/nteract/papermill)
[![Azure Build Status](https://dev.azure.com/nteract/nteract/_apis/build/status/nteract.papermill?branchName=main)](https://dev.azure.com/nteract/nteract/_build/latest?definitionId=5&branchName=main)
[![image](https://codecov.io/github/nteract/papermill/coverage.svg?branch=main)](https://codecov.io/github/nteract/papermill?branch=main)
[![Documentation Status](https://readthedocs.org/projects/papermill/badge/?version=latest)](http://papermill.readthedocs.io/en/latest/?badge=latest)
[![badge](https://tinyurl.com/ybwovtw2)](https://mybinder.org/v2/gh/nteract/papermill/master?filepath=binder%2Fprocess_highlight_dates.ipynb)
[![badge](https://tinyurl.com/y7uz2eh9)](https://mybinder.org/v2/gh/nteract/papermill/master?)
[![badge](https://tinyurl.com/ybwovtw2)](https://mybinder.org/v2/gh/nteract/papermill/main?filepath=binder%2Fprocess_highlight_dates.ipynb)
[![badge](https://tinyurl.com/y7uz2eh9)](https://mybinder.org/v2/gh/nteract/papermill/main?)
[![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/)
[![Python 3.7](https://img.shields.io/badge/python-3.7-blue.svg)](https://www.python.org/downloads/release/python-370/)
[![Python 3.8](https://img.shields.io/badge/python-3.8-blue.svg)](https://www.python.org/downloads/release/python-380/)
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
trigger:
- master
- main

# Set variables once
variables:
Expand Down
56 changes: 28 additions & 28 deletions binder/cli-simple/simple_output.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"cell_type": "markdown",
"metadata": {
"papermill": {
"duration": 0.019085,
"end_time": "2020-06-15T00:38:19.879972",
"duration": 0.00964,
"end_time": "2020-08-17T19:57:24.239226",
"exception": false,
"start_time": "2020-06-15T00:38:19.860887",
"start_time": "2020-08-17T19:57:24.229586",
"status": "completed"
},
"tags": []
Expand All @@ -21,16 +21,16 @@
"execution_count": 1,
"metadata": {
"execution": {
"iopub.execute_input": "2020-06-15T00:38:19.895422Z",
"iopub.status.busy": "2020-06-15T00:38:19.894896Z",
"iopub.status.idle": "2020-06-15T00:38:19.896926Z",
"shell.execute_reply": "2020-06-15T00:38:19.897449Z"
"iopub.execute_input": "2020-08-17T19:57:24.263404Z",
"iopub.status.busy": "2020-08-17T19:57:24.262659Z",
"iopub.status.idle": "2020-08-17T19:57:24.265395Z",
"shell.execute_reply": "2020-08-17T19:57:24.264689Z"
},
"papermill": {
"duration": 0.009661,
"end_time": "2020-06-15T00:38:19.897597",
"duration": 0.012719,
"end_time": "2020-08-17T19:57:24.265567",
"exception": false,
"start_time": "2020-06-15T00:38:19.887936",
"start_time": "2020-08-17T19:57:24.252848",
"status": "completed"
},
"tags": [
Expand All @@ -47,16 +47,16 @@
"execution_count": 2,
"metadata": {
"execution": {
"iopub.execute_input": "2020-06-15T00:38:19.905246Z",
"iopub.status.busy": "2020-06-15T00:38:19.904797Z",
"iopub.status.idle": "2020-06-15T00:38:19.906324Z",
"shell.execute_reply": "2020-06-15T00:38:19.906762Z"
"iopub.execute_input": "2020-08-17T19:57:24.274405Z",
"iopub.status.busy": "2020-08-17T19:57:24.273934Z",
"iopub.status.idle": "2020-08-17T19:57:24.276194Z",
"shell.execute_reply": "2020-08-17T19:57:24.275695Z"
},
"papermill": {
"duration": 0.006814,
"end_time": "2020-06-15T00:38:19.906867",
"duration": 0.007713,
"end_time": "2020-08-17T19:57:24.276300",
"exception": false,
"start_time": "2020-06-15T00:38:19.900053",
"start_time": "2020-08-17T19:57:24.268587",
"status": "completed"
},
"tags": [
Expand All @@ -74,16 +74,16 @@
"execution_count": 3,
"metadata": {
"execution": {
"iopub.execute_input": "2020-06-15T00:38:19.914520Z",
"iopub.status.busy": "2020-06-15T00:38:19.914053Z",
"iopub.status.idle": "2020-06-15T00:38:19.916372Z",
"shell.execute_reply": "2020-06-15T00:38:19.915909Z"
"iopub.execute_input": "2020-08-17T19:57:24.283119Z",
"iopub.status.busy": "2020-08-17T19:57:24.282711Z",
"iopub.status.idle": "2020-08-17T19:57:24.284846Z",
"shell.execute_reply": "2020-08-17T19:57:24.284482Z"
},
"papermill": {
"duration": 0.00722,
"end_time": "2020-06-15T00:38:19.916452",
"duration": 0.006366,
"end_time": "2020-08-17T19:57:24.284929",
"exception": false,
"start_time": "2020-06-15T00:38:19.909232",
"start_time": "2020-08-17T19:57:24.278563",
"status": "completed"
},
"tags": []
Expand Down Expand Up @@ -123,17 +123,17 @@
"version": "3.8.2"
},
"papermill": {
"duration": 0.823709,
"end_time": "2020-06-15T00:38:20.126604",
"duration": 0.727728,
"end_time": "2020-08-17T19:57:24.494284",
"environment_variables": {},
"exception": null,
"input_path": "binder/cli-simple/simple_input.ipynb",
"output_path": "binder/cli-simple/simple_output.ipynb",
"parameters": {
"msg": "Hello"
},
"start_time": "2020-06-15T00:38:19.302895",
"version": "2.1.1"
"start_time": "2020-08-17T19:57:23.766556",
"version": "2.1.3"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion docs/extending-developing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ Development of papermill happens on github, and a
`code of conduct`_ there. Please read both documents before beginning!


.. _`detailed guide to contributing`: https://github.com/nteract/papermill/blob/master/CONTRIBUTING.md
.. _`detailed guide to contributing`: https://github.com/nteract/papermill/blob/main/CONTRIBUTING.md
.. _`code of conduct`: https://github.com/nteract/nteract/blob/master/CODE_OF_CONDUCT.md
10 changes: 5 additions & 5 deletions docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Welcome to papermill
====================

.. image:: https://travis-ci.org/nteract/papermill.svg?branch=master
.. image:: https://travis-ci.org/nteract/papermill.svg?branch=main
:target: https://travis-ci.org/nteract/papermill
.. image:: https://codecov.io/github/nteract/papermill/coverage.svg?branch=master
:target: https://codecov.io/github/nteract/papermill?branch=master
.. image:: https://codecov.io/github/nteract/papermill/coverage.svg?branch=main
:target: https://codecov.io/github/nteract/papermill?branch=main
.. image:: https://readthedocs.org/projects/papermill/badge/?version=latest
:target: http://papermill.readthedocs.io/en/latest/?badge=latest
.. image:: https://tinyurl.com/ybwovtw2
:target: https://mybinder.org/v2/gh/nteract/papermill/master?filepath=binder%2Fprocess_highlight_dates.ipynb
:target: https://mybinder.org/v2/gh/nteract/papermill/main?filepath=binder%2Fprocess_highlight_dates.ipynb
.. image:: https://tinyurl.com/y7uz2eh9
:target: https://mybinder.org/v2/gh/nteract/papermill/master?filepath=binder%2Fcli-simple%2Fcli_example.ipynb
:target: https://mybinder.org/v2/gh/nteract/papermill/main?filepath=binder%2Fcli-simple%2Fcli_example.ipynb
.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black

Expand Down
2 changes: 1 addition & 1 deletion docs/usage-workflow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ For an interactive example that demonstrates the usage of papermill, click the B
below:

.. image:: https://mybinder.org/badge.svg
:target: https://mybinder.org/v2/gh/nteract/papermill/master?filepath=binder%2Fprocess_highlight_dates.ipynb
:target: https://mybinder.org/v2/gh/nteract/papermill/main?filepath=binder%2Fprocess_highlight_dates.ipynb
:alt: launch binder

Using papermill
Expand Down

0 comments on commit 83f1d5d

Please sign in to comment.