Skip to content

Commit 37bdff7

Browse files
authored
Switch default branch from master to main (#316)
1 parent 7bca5fa commit 37bdff7

File tree

3 files changed

+22
-22
lines changed

3 files changed

+22
-22
lines changed

CONTRIBUTING.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,17 +174,17 @@ Release Workflow
174174
The process of releasing a new version involves several steps combining both ``git`` and
175175
``bumpversion`` which, briefly:
176176

177-
1. Merge what is in ``master`` branch into ``stable`` branch.
177+
1. Merge what is in ``main`` branch into ``stable`` branch.
178178
2. Update the version in ``setup.cfg``, ``ctgan/__init__.py`` and
179179
``HISTORY.md`` files.
180180
3. Create a new git tag pointing at the corresponding commit in ``stable`` branch.
181-
4. Merge the new commit from ``stable`` into ``master``.
181+
4. Merge the new commit from ``stable`` into ``main``.
182182
5. Update the version in ``setup.cfg`` and ``ctgan/__init__.py``
183183
to open the next development iteration.
184184

185185
.. note:: Before starting the process, make sure that ``HISTORY.md`` has been updated with a new
186186
entry that explains the changes that will be included in the new version.
187-
Normally this is just a list of the Pull Requests that have been merged to master
187+
Normally this is just a list of the Pull Requests that have been merged to main
188188
since the last release.
189189

190190
Once this is done, run of the following commands:

Makefile

+14-14
Original file line numberDiff line numberDiff line change
@@ -158,22 +158,22 @@ publish: dist publish-confirm ## package and upload a release
158158
twine upload dist/*
159159

160160
.PHONY: bumpversion-release
161-
bumpversion-release: ## Merge master to stable and bumpversion release
161+
bumpversion-release: ## Merge main to stable and bumpversion release
162162
git checkout stable || git checkout -b stable
163-
git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable"
163+
git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable"
164164
bumpversion release
165165
git push --tags origin stable
166166

167167
.PHONY: bumpversion-release-test
168-
bumpversion-release-test: ## Merge master to stable and bumpversion release
168+
bumpversion-release-test: ## Merge main to stable and bumpversion release
169169
git checkout stable || git checkout -b stable
170-
git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable"
170+
git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable"
171171
bumpversion release --no-tag
172172
@echo git push --tags origin stable
173173

174174
.PHONY: bumpversion-patch
175-
bumpversion-patch: ## Merge stable to master and bumpversion patch
176-
git checkout master
175+
bumpversion-patch: ## Merge stable to main and bumpversion patch
176+
git checkout main
177177
git merge stable
178178
bumpversion --no-tag patch
179179
git push
@@ -192,7 +192,7 @@ bumpversion-major: ## Bump the version the next major skipping the release
192192

193193
.PHONY: bumpversion-revert
194194
bumpversion-revert: ## Undo a previous bumpversion-release
195-
git checkout master
195+
git checkout main
196196
git branch -D stable
197197

198198
CLEAN_DIR := $(shell git status --short | grep -v ??)
@@ -205,10 +205,10 @@ ifneq ($(CLEAN_DIR),)
205205
$(error There are uncommitted changes)
206206
endif
207207

208-
.PHONY: check-master
209-
check-master: ## Check if we are in master branch
210-
ifneq ($(CURRENT_BRANCH),master)
211-
$(error Please make the release from master branch\n)
208+
.PHONY: check-main
209+
check-main: ## Check if we are in main branch
210+
ifneq ($(CURRENT_BRANCH),main)
211+
$(error Please make the release from main branch\n)
212212
endif
213213

214214
.PHONY: check-history
@@ -218,7 +218,7 @@ ifeq ($(CHANGELOG_LINES),0)
218218
endif
219219

220220
.PHONY: check-release
221-
check-release: check-clean check-master check-history ## Check if the release can be made
221+
check-release: check-clean check-main check-history ## Check if the release can be made
222222
@echo "A new release can be made"
223223

224224
.PHONY: release
@@ -228,10 +228,10 @@ release: check-release bumpversion-release publish bumpversion-patch
228228
release-test: check-release bumpversion-release-test publish-test bumpversion-revert
229229

230230
.PHONY: release-candidate
231-
release-candidate: check-master publish bumpversion-candidate
231+
release-candidate: check-main publish bumpversion-candidate
232232

233233
.PHONY: release-candidate-test
234-
release-candidate-test: check-clean check-master publish-test
234+
release-candidate-test: check-clean check-main publish-test
235235

236236
.PHONY: release-minor
237237
release-minor: check-release bumpversion-minor release

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
[![PyPI Shield](https://img.shields.io/pypi/v/ctgan.svg)](https://pypi.python.org/pypi/ctgan)
99
[![Unit Tests](https://github.com/sdv-dev/CTGAN/actions/workflows/unit.yml/badge.svg)](https://github.com/sdv-dev/CTGAN/actions/workflows/unit.yml)
1010
[![Downloads](https://pepy.tech/badge/ctgan)](https://pepy.tech/project/ctgan)
11-
[![Coverage Status](https://codecov.io/gh/sdv-dev/CTGAN/branch/master/graph/badge.svg)](https://codecov.io/gh/sdv-dev/CTGAN)
11+
[![Coverage Status](https://codecov.io/gh/sdv-dev/CTGAN/branch/main/graph/badge.svg)](https://codecov.io/gh/sdv-dev/CTGAN)
1212

1313
<div align="left">
1414
<br/>
1515
<p align="center">
1616
<a href="https://github.com/sdv-dev/CTGAN">
17-
<img align="center" width=40% src="https://github.com/sdv-dev/SDV/blob/master/docs/images/CTGAN-DataCebo.png"></img>
17+
<img align="center" width=40% src="https://github.com/sdv-dev/SDV/blob/stable/docs/images/CTGAN-DataCebo.png"></img>
1818
</a>
1919
</p>
2020
</div>
@@ -38,9 +38,9 @@ CTGAN is a collection of Deep Learning based synthetic data generators for s
3838
[Blog]: https://datacebo.com/blog
3939
[Documentation]: https://bit.ly/sdv-docs
4040
[Repository]: https://github.com/sdv-dev/CTGAN
41-
[License]: https://github.com/sdv-dev/CTGAN/blob/master/LICENSE
41+
[License]: https://github.com/sdv-dev/CTGAN/blob/main/LICENSE
4242
[Development Status]: https://pypi.org/search/?c=Development+Status+%3A%3A+2+-+Pre-Alpha
43-
[Slack Logo]: https://github.com/sdv-dev/SDV/blob/master/docs/images/slack.png
43+
[Slack Logo]: https://github.com/sdv-dev/SDV/blob/stable/docs/images/slack.png
4444
[Community]: https://bit.ly/sdv-slack-invite
4545

4646
Currently, this library implements the **CTGAN** and **TVAE** models described in the [Modeling Tabular data using Conditional GAN](https://arxiv.org/abs/1907.00503) paper, presented at the 2019 NeurIPS conference.
@@ -141,7 +141,7 @@ More details can be found in the corresponding repository: https://github.com/ka
141141

142142

143143
<div align="center">
144-
<a href="https://datacebo.com"><img align="center" width=40% src="https://github.com/sdv-dev/SDV/blob/master/docs/images/DataCebo.png"></img></a>
144+
<a href="https://datacebo.com"><img align="center" width=40% src="https://github.com/sdv-dev/SDV/blob/stable/docs/images/DataCebo.png"></img></a>
145145
</div>
146146
<br/>
147147
<br/>

0 commit comments

Comments
 (0)