diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 356833fd80ccc96c80b8a776b76f6c6c5ae920a2..d8ea4dfe015940f2b159898850c926a0f870f7ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,7 @@ name: CI on: push: branches: - - master + - main pull_request: paths-ignore: - 'doc/*.rst' @@ -21,7 +21,7 @@ jobs: python-version: '3.x' - name: "Main Script" run: | - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" ./test pylint: @@ -36,7 +36,7 @@ jobs: - name: "Main Script" run: | EXTRA_INSTALL="pymbolic" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh . ./prepare-and-run-pylint.sh "$(basename $GITHUB_REPOSITORY)" test/test_*.py mypy: @@ -50,7 +50,7 @@ jobs: python-version: '3.x' - name: "Main Script" run: | - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-mypy.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-mypy.sh . ./prepare-and-run-mypy.sh python3 mypy pytest: @@ -75,7 +75,7 @@ jobs: rm pytools/log.py EXTRA_INSTALL="numpy" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh . ./build-and-test-py-project.sh #examples: @@ -90,7 +90,7 @@ jobs: # - name: "Main Script" # run: | # EXTRA_INSTALL="numpy pymbolic" - # curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + # curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh # . ./ci-support.sh # build_py_project_in_venv # run_examples @@ -107,7 +107,7 @@ jobs: - name: "Main Script" run: | EXTRA_INSTALL="numpy" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh . ci-support.sh build_py_project_in_venv build_docs diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8c5ccac20080bb1d7e29a062a232d4296856818..be167b79ecb583bff0e8c1f6bf1d3eb1510ba96c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ Pytest: rm pytools/log.py export EXTRA_INSTALL="numpy" - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project.sh + curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project.sh . ./build-and-test-py-project.sh tags: - python3 @@ -21,7 +21,7 @@ Pytest: # Examples: # script: | # EXTRA_INSTALL="numpy pymbolic" -# curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/ci-support.sh +# curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/ci-support.sh # . ./ci-support.sh # build_py_project_in_venv # run_examples @@ -32,7 +32,7 @@ Pytest: Flake8: script: - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-flake8.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME" test tags: - python3 @@ -41,7 +41,7 @@ Flake8: Mypy: script: - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-mypy.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-mypy.sh - ". ./prepare-and-run-mypy.sh python3 mypy" tags: - python3 @@ -52,7 +52,7 @@ Pylint: script: - EXTRA_INSTALL="pymbolic" - py_version=3 - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/prepare-and-run-pylint.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-pylint.sh - . ./prepare-and-run-pylint.sh "$CI_PROJECT_NAME" test/test_*.py tags: - python3 @@ -62,7 +62,7 @@ Pylint: Documentation: script: - EXTRA_INSTALL="numpy" - - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-docs.sh + - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-docs.sh - ". ./build-docs.sh" tags: - python3 diff --git a/README.rst b/README.rst index 64430f6213fa63d2cab1fd2071234309ce4e7c09..31038d474239ce72b751f4b36900a921b6560aa0 100644 --- a/README.rst +++ b/README.rst @@ -1,12 +1,12 @@ Pytools: Lots of Little Utilities ================================= -.. image:: https://gitlab.tiker.net/inducer/pytools/badges/master/pipeline.svg +.. image:: https://gitlab.tiker.net/inducer/pytools/badges/main/pipeline.svg :alt: Gitlab Build Status - :target: https://gitlab.tiker.net/inducer/pytools/commits/master -.. image:: https://github.com/inducer/pytools/workflows/CI/badge.svg?branch=master&event=push + :target: https://gitlab.tiker.net/inducer/pytools/commits/main +.. image:: https://github.com/inducer/pytools/workflows/CI/badge.svg?branch=main&event=push :alt: Github Build Status - :target: https://github.com/inducer/pytools/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush + :target: https://github.com/inducer/pytools/actions?query=branch%3Amain+workflow%3ACI+event%3Apush .. image:: https://badge.fury.io/py/pytools.png :alt: Python Package Index Release Page :target: https://pypi.org/project/pytools/