From 946e69a232a0d2bc04b392e8df0e7f1a63d2838b Mon Sep 17 00:00:00 2001 From: Andrew Montanez Date: Sat, 16 Sep 2023 12:54:07 -0500 Subject: [PATCH] Switch default branch from master to main --- CONTRIBUTING.rst | 6 +++--- Makefile | 28 ++++++++++++++-------------- README.md | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index a21b70ab..893eb130 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -174,17 +174,17 @@ Release Workflow The process of releasing a new version involves several steps combining both ``git`` and ``bumpversion`` which, briefly: -1. Merge what is in ``master`` branch into ``stable`` branch. +1. Merge what is in ``main`` branch into ``stable`` branch. 2. Update the version in ``setup.cfg``, ``ctgan/__init__.py`` and ``HISTORY.md`` files. 3. Create a new git tag pointing at the corresponding commit in ``stable`` branch. -4. Merge the new commit from ``stable`` into ``master``. +4. Merge the new commit from ``stable`` into ``main``. 5. Update the version in ``setup.cfg`` and ``ctgan/__init__.py`` to open the next development iteration. .. note:: Before starting the process, make sure that ``HISTORY.md`` has been updated with a new entry that explains the changes that will be included in the new version. - Normally this is just a list of the Pull Requests that have been merged to master + Normally this is just a list of the Pull Requests that have been merged to main since the last release. Once this is done, run of the following commands: diff --git a/Makefile b/Makefile index bb667a14..ea6a8132 100644 --- a/Makefile +++ b/Makefile @@ -158,22 +158,22 @@ publish: dist publish-confirm ## package and upload a release twine upload dist/* .PHONY: bumpversion-release -bumpversion-release: ## Merge master to stable and bumpversion release +bumpversion-release: ## Merge main to stable and bumpversion release git checkout stable || git checkout -b stable - git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable" + git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable" bumpversion release git push --tags origin stable .PHONY: bumpversion-release-test -bumpversion-release-test: ## Merge master to stable and bumpversion release +bumpversion-release-test: ## Merge main to stable and bumpversion release git checkout stable || git checkout -b stable - git merge --no-ff master -m"make release-tag: Merge branch 'master' into stable" + git merge --no-ff main -m"make release-tag: Merge branch 'main' into stable" bumpversion release --no-tag @echo git push --tags origin stable .PHONY: bumpversion-patch -bumpversion-patch: ## Merge stable to master and bumpversion patch - git checkout master +bumpversion-patch: ## Merge stable to main and bumpversion patch + git checkout main git merge stable bumpversion --no-tag patch git push @@ -192,7 +192,7 @@ bumpversion-major: ## Bump the version the next major skipping the release .PHONY: bumpversion-revert bumpversion-revert: ## Undo a previous bumpversion-release - git checkout master + git checkout main git branch -D stable CLEAN_DIR := $(shell git status --short | grep -v ??) @@ -205,10 +205,10 @@ ifneq ($(CLEAN_DIR),) $(error There are uncommitted changes) endif -.PHONY: check-master -check-master: ## Check if we are in master branch -ifneq ($(CURRENT_BRANCH),master) - $(error Please make the release from master branch\n) +.PHONY: check-main +check-main: ## Check if we are in main branch +ifneq ($(CURRENT_BRANCH),main) + $(error Please make the release from main branch\n) endif .PHONY: check-history @@ -218,7 +218,7 @@ ifeq ($(CHANGELOG_LINES),0) endif .PHONY: check-release -check-release: check-clean check-master check-history ## Check if the release can be made +check-release: check-clean check-main check-history ## Check if the release can be made @echo "A new release can be made" .PHONY: release @@ -228,10 +228,10 @@ release: check-release bumpversion-release publish bumpversion-patch release-test: check-release bumpversion-release-test publish-test bumpversion-revert .PHONY: release-candidate -release-candidate: check-master publish bumpversion-candidate +release-candidate: check-main publish bumpversion-candidate .PHONY: release-candidate-test -release-candidate-test: check-clean check-master publish-test +release-candidate-test: check-clean check-main publish-test .PHONY: release-minor release-minor: check-release bumpversion-minor release diff --git a/README.md b/README.md index 497a87ac..42790da7 100644 --- a/README.md +++ b/README.md @@ -8,13 +8,13 @@ [![PyPI Shield](https://img.shields.io/pypi/v/ctgan.svg)](https://pypi.python.org/pypi/ctgan) [![Unit Tests](https://github.com/sdv-dev/CTGAN/actions/workflows/unit.yml/badge.svg)](https://github.com/sdv-dev/CTGAN/actions/workflows/unit.yml) [![Downloads](https://pepy.tech/badge/ctgan)](https://pepy.tech/project/ctgan) -[![Coverage Status](https://codecov.io/gh/sdv-dev/CTGAN/branch/master/graph/badge.svg)](https://codecov.io/gh/sdv-dev/CTGAN) +[![Coverage Status](https://codecov.io/gh/sdv-dev/CTGAN/branch/main/graph/badge.svg)](https://codecov.io/gh/sdv-dev/CTGAN)

- +

@@ -38,9 +38,9 @@ CTGAN is a collection of Deep Learning based synthetic data generators for s [Blog]: https://datacebo.com/blog [Documentation]: https://bit.ly/sdv-docs [Repository]: https://github.com/sdv-dev/CTGAN -[License]: https://github.com/sdv-dev/CTGAN/blob/master/LICENSE +[License]: https://github.com/sdv-dev/CTGAN/blob/main/LICENSE [Development Status]: https://pypi.org/search/?c=Development+Status+%3A%3A+2+-+Pre-Alpha -[Slack Logo]: https://github.com/sdv-dev/SDV/blob/master/docs/images/slack.png +[Slack Logo]: https://github.com/sdv-dev/SDV/blob/stable/docs/images/slack.png [Community]: https://bit.ly/sdv-slack-invite 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
- +