gian/resync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change master->main

Browse Source
This commit is contained in:
Simeon Warner 2021-03-23 08:21:41 -04:00
parent 51b384cc07
commit 6a35c1c95d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -1,7 +1,7 @@
# resync # resync
[![Build Status](https://travis-ci.org/resync/resync.svg?branch=master)](https://travis-ci.org/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=master)](https://coveralls.io/github/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, **resync** is a ResourceSync library with supporting client scipts,
written in python. written in python.
@ -102,7 +102,7 @@ Thanks to: [Bernhard Haslhofer](https://github.com/behas),
[Robert Sanderson](<https://github.com/azaroth42) [Robert Sanderson](<https://github.com/azaroth42)
and [other contributors](https://github.com/resync/resync/graphs/contributors). and [other contributors](https://github.com/resync/resync/graphs/contributors).
See [CONTRIBUTING.md](https://github.com/resync/resync/blob/master/CONTRIBUTING.md) See [CONTRIBUTING.md](https://github.com/resync/resync/blob/main/CONTRIBUTING.md)
for guidelines for contributing. for guidelines for contributing.
## Copyright and License ## Copyright and License

4
docs/pypi_upload.md
View File

@ -9,9 +9,9 @@ resync is at <https://pypi.python.org/pypi/resync> on pypi
0. In `develop` branch: bump version number in `resync/__init__.py` and check `CHANGES.md` is up to date 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) 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 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) 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`) 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`) 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: 8. Check client works with simulator: