diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 48ec5b71f0bcb3935f78662b4ea89896e479e482..0395243677fcee92b39eb218ce2f65bae6cacd39 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 examples benchmarks
docs:
@@ -32,7 +32,7 @@ jobs:
- name: "Main Script"
run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- 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
build_docs
@@ -46,7 +46,7 @@ jobs:
run: |
grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
pytest_symengine:
@@ -57,7 +57,7 @@ jobs:
- name: "Main Script"
run: |
CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
. ./build-and-test-py-project-within-miniconda.sh
examples:
@@ -69,7 +69,7 @@ jobs:
run: |
grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- 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
EXTRA_INSTALL="pyvisfile scipy"
build_py_project_in_conda_env
@@ -95,7 +95,7 @@ jobs:
export CONDA_ENVIRONMENT=.test-conda-env-py3.yml
# 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
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e8b886af34ad10803d9cdf6b7d730400692595d..40517d542b3a0e942f4b78b90a9ed4b2e9360244 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@
# - export PY_EXE=python3.5
# - export PYOPENCL_TEST=nvi:k40
# - export EXTRA_INSTALL="numpy mako"
-# - 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.5
@@ -22,7 +22,7 @@ Pytest POCL:
- export PY_EXE=python3
- export PYOPENCL_TEST=portable:pthread
- export EXTRA_INSTALL="pybind11 numpy mako"
- - 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
@@ -38,7 +38,7 @@ Pytest Titan V:
- py_version=3
- export PYOPENCL_TEST=nvi:titan
- EXTRA_INSTALL="pybind11 numpy mako"
- - 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
@@ -57,7 +57,7 @@ Pytest Conda:
- export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine
- export PYOPENCL_TEST=portable:pthread
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
- large-node
@@ -74,7 +74,7 @@ Pytest POCL Titan V:
- export SUMPY_FORCE_SYMBOLIC_BACKEND=symengine
- export PYOPENCL_TEST=portable:titan
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-test-py-project-within-miniconda.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-test-py-project-within-miniconda.sh
- ". ./build-and-test-py-project-within-miniconda.sh"
tags:
- nvidia-titan-v
@@ -88,7 +88,7 @@ Examples Conda:
script: |
grep -v symengine .test-conda-env-py3.yml > .test-conda-env.yml
CONDA_ENVIRONMENT=.test-conda-env.yml
- 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
EXTRA_INSTALL="pyvisfile scipy"
build_py_project_in_conda_env
@@ -101,14 +101,14 @@ Examples Conda:
Documentation:
script:
- EXTRA_INSTALL="pybind11 numpy mako"
- - 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
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 examples benchmarks
tags:
- python3
@@ -120,7 +120,7 @@ Benchmarks:
- CONDA_ENVIRONMENT=.test-conda-env-py3.yml
- PROJECT=sumpy
- PYOPENCL_TEST=portable:pthread
- - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/master/build-and-benchmark-py-project.sh
+ - curl -L -O -k https://gitlab.tiker.net/inducer/ci-support/raw/main/build-and-benchmark-py-project.sh
- ". ./build-and-benchmark-py-project.sh"
tags:
- linux
diff --git a/README.rst b/README.rst
index 1ab91cb81d76ce6d4c9fb4e0aebe1789a18cdee7..7d4041be88d22e6f3102e914b543494863cbb804 100644
--- a/README.rst
+++ b/README.rst
@@ -1,12 +1,12 @@
sumpy: n-body kernels and translation operators
===============================================
-.. image:: https://gitlab.tiker.net/inducer/sumpy/badges/master/pipeline.svg
+.. image:: https://gitlab.tiker.net/inducer/sumpy/badges/main/pipeline.svg
:alt: Gitlab Build Status
- :target: https://gitlab.tiker.net/inducer/sumpy/commits/master
-.. image:: https://github.com/inducer/sumpy/workflows/CI/badge.svg?branch=master&event=push
+ :target: https://gitlab.tiker.net/inducer/sumpy/commits/main
+.. image:: https://github.com/inducer/sumpy/workflows/CI/badge.svg?branch=main&event=push
:alt: Github Build Status
- :target: https://github.com/inducer/sumpy/actions?query=branch%3Amaster+workflow%3ACI+event%3Apush
+ :target: https://github.com/inducer/sumpy/actions?query=branch%3Amain+workflow%3ACI+event%3Apush
.. image:: https://badge.fury.io/py/sumpy.png
:alt: Python Package Index Release Page
:target: https://pypi.org/project/sumpy/