Merge pull request #48 from inducer/master-to-main

CI/README: master->main

Author: inducer

.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 gen_wrap.py examples
 
     pytest:
@@ -39,7 +39,7 @@ jobs:
         -   name: "Main Script"
             run: |
                 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:
@@ -57,7 +57,7 @@ jobs:
         -   name: "Main Script"
             run: |
                 EXTRA_INSTALL="matplotlib 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
                 run_examples
@@ -73,7 +73,7 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
-                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
 
     docs:
@@ -87,7 +87,7 @@ jobs:
                 python-version: '3.x'
         -   name: "Main Script"
             run: |
-                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
@@ -116,7 +116,7 @@ jobs:
                 # Avoid slow or complicated tests in downstream projects
                 export PYTEST_ADDOPTS="-k 'not (slowtest or octave or mpi)'"
 
-                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_conda_env
                 test_py_project

.github/workflows/wheels.yml

@@ -2,7 +2,7 @@ name: Build wheels
 on:
   push:
     branches:
-      - master
+      - main
   create:
     tags:
       - v*

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 Python 3:
   script: |
     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
@@ -14,7 +14,7 @@ Python 3:
 Examples:
   script: |
     EXTRA_INSTALL="matplotlib 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
     run_examples
@@ -25,7 +25,7 @@ Examples:
 
 Python 3 without small-integer opt:
   script: |
-    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
     ./configure.py --no-use-imath-sio
     . ./build-and-test-py-project.sh
   tags:
@@ -55,7 +55,7 @@ Python 3 + Barvinok:
 PyPy3:
   script:
   - export PY_EXE=pypy3
-  - 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"
   allow_failure: true
   tags:
@@ -68,16 +68,16 @@ PyPy3:
 
 Documentation:
   script:
-  - 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
   only:
-  - master
+  - main
 
 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 gen_wrap.py examples
   tags:
   - python3

README.rst

@@ -1,12 +1,12 @@
 islpy: Polyhedral Analysis from Python
 ======================================
 
-.. image:: https://gitlab.tiker.net/inducer/islpy/badges/master/pipeline.svg
+.. image:: https://gitlab.tiker.net/inducer/islpy/badges/main/pipeline.svg
     :alt: Gitlab Build Status
-    :target: https://gitlab.tiker.net/inducer/islpy/commits/master
-.. image:: https://github.com/inducer/islpy/workflows/CI/badge.svg?branch=master&event=push
+    :target: https://gitlab.tiker.net/inducer/islpy/commits/main
+.. image:: https://github.com/inducer/islpy/workflows/CI/badge.svg?branch=main&event=push
     :alt: Github Build Status
-    :target: https://github.com/inducer/islpy/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush
+    :target: https://github.com/inducer/islpy/actions?query=branch%3Amain+workflow%3ACI+event%3Apush
 .. image:: https://badge.fury.io/py/islpy.png
     :alt: Python Package Index Release Page
     :target: https://pypi.org/project/islpy/