From 6a35c1c95dacc5ab16752984b296a2eab211b6fa Mon Sep 17 00:00:00 2001 From: Simeon Warner Date: Tue, 23 Mar 2021 08:21:41 -0400 Subject: [PATCH] Change master->main --- README.md | 6 +++--- docs/pypi_upload.md | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ddd6068..8abecc5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # resync -[![Build Status](https://travis-ci.org/resync/resync.svg?branch=master)](https://travis-ci.org/resync/resync) -[![Test Coverage](https://coveralls.io/repos/github/resync/resync/badge.svg?branch=master)](https://coveralls.io/github/resync/resync) +[![Build Status](https://travis-ci.org/resync/resync.svg?branch=main)](https://travis-ci.org/resync/resync) +[![Test Coverage](https://coveralls.io/repos/github/resync/resync/badge.svg?branch=main)](https://coveralls.io/github/resync/resync) **resync** is a ResourceSync library with supporting client scipts, written in python. @@ -102,7 +102,7 @@ Thanks to: [Bernhard Haslhofer](https://github.com/behas), [Robert Sanderson]( on pypi 0. In `develop` branch: bump version number in `resync/__init__.py` and check `CHANGES.md` is up to date 1. Check all tests good with appropriate Python 3.x (`python setup.py test` and CI) 2. Check code is up-to-date with github version -3. Check out `master` and merge in `develop` +3. Check out `main` and merge in `develop` 4. Check all tests still good (`python setup.py test` and CI) -5. Make sure master `README.md` has correct travis-ci icon link +5. Make sure main `README.md` has correct travis-ci icon link 6. Check branches as expected (`git branch -a`) 7. Check local build and version reported OK (`python setup.py build; python setup.py install; resync-sync -h`) 8. Check client works with simulator: