Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
pull_request:
push:
branches:
- master
- main
- main
tags:
- "*.*.*"
Expand Down
10 changes: 5 additions & 5 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
#
# source_encoding = 'utf-8-sig'

# The master toctree document.
master_doc = 'index'
# The main toctree document.
main_doc = 'index'

# General information about the project.
project = 'CMake Python Distributions'
Expand Down Expand Up @@ -266,7 +266,7 @@
# (source start file, target name, title,
# author, documentclass [howto, manual, or own class]).
latex_documents = [
(master_doc, 'CMakePythonDistributions.tex', 'CMake Python Distributions Documentation',
(main_doc, 'CMakePythonDistributions.tex', 'CMake Python Distributions Documentation',
'Jean-Christophe Fillion-Robin', 'manual'),
]

Expand Down Expand Up @@ -308,7 +308,7 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
(master_doc, 'cmakepythondistributions', 'CMake Python Distributions Documentation',
(main_doc, 'cmakepythondistributions', 'CMake Python Distributions Documentation',
[author], 1)
]

Expand All @@ -323,7 +323,7 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
(master_doc, 'CMakePythonDistributions', 'CMake Python Distributions Documentation',
(main_doc, 'CMakePythonDistributions', 'CMake Python Distributions Documentation',
author, 'CMakePythonDistributions', 'One line description of project.',
'Miscellaneous'),
]
Expand Down
2 changes: 1 addition & 1 deletion docs/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. CMake Python Distributions documentation master file, created by
.. CMake Python Distributions documentation main file, created by
sphinx-quickstart on Wed Nov 9 02:28:46 2016.
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
Expand Down
2 changes: 1 addition & 1 deletion docs/make_a_release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ means that ``echo "Hello"`` should be copied and evaluated in the terminal.

.. code::

$ git tag --sign -m "cmake-python-distributions $release" $release master
$ git tag --sign -m "cmake-python-distributions $release" $release main

.. warning::

Expand Down
4 changes: 2 additions & 2 deletions scripts/utils.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

set -e

# Copied from https://github.com/pypa/manylinux/blob/master/docker/build_scripts/build_utils.sh
# Copied from https://github.com/pypa/manylinux/blob/main/docker/build_scripts/build_utils.sh
function check_var {
if [ -z "$1" ]; then
echo "required variable not defined"
exit 1
fi
}

# Copied from https://github.com/pypa/manylinux/blob/master/docker/build_scripts/build_utils.sh
# Copied from https://github.com/pypa/manylinux/blob/main/docker/build_scripts/build_utils.sh
function check_sha256sum {
local fname=$1
check_var ${fname}
Expand Down