master > main (#31)

LCSL · Jan 4, 2022 · 0d363e2 · 0d363e2
1 parent 95f4b0f
commit 0d363e2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,7 +24,7 @@ jobs:
                 echo "Merging $(cat merge.txt)";
                 git remote add upstream git://github.com/lcsl/iterreg.git;
                 git pull --ff-only upstream "refs/pull/$(cat merge.txt)/merge";
-                git fetch upstream master;
+                git fetch upstream main;
               fi
 
         # If both keys are in the same command only one is restored
@@ -81,7 +81,7 @@ jobs:
         - run:
             name: deploy
             command: |
-              if [[ ${CIRCLE_BRANCH} == "master" ]]; then
+              if [[ ${CIRCLE_BRANCH} == "main" ]]; then
                 set -e
                 mkdir -p ~/.ssh
                 echo -e "Host *\nStrictHostKeyChecking no" > ~/.ssh/config

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,10 +3,10 @@ name: build
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   build-linux:

diff --git a/.github/workflows/flake8.yml b/.github/workflows/flake8.yml
@@ -3,12 +3,12 @@ name: linter
 on:
   create:
     branches:
-      - 'master'
+      - 'main'
     tags:
       - '**'
   pull_request:
     branches:
-      - master
+      - main
 
 jobs:
   lint:

diff --git a/README.rst b/README.rst
@@ -67,5 +67,5 @@ ArXiv links:
 
 .. |image0| image:: https://github.com/LCSL/iterreg/workflows/build/badge.svg
    :target: https://github.com/LCSL/iterreg/actions?query=workflow%3Abuild
-.. |image1| image:: https://codecov.io/gh/LCSL/iterreg/branch/master/graphs/badge.svg?branch=master
+.. |image1| image:: https://codecov.io/gh/LCSL/iterreg/branch/main/graphs/badge.svg?branch=main
    :target: https://codecov.io/gh/LCSL/iterreg
diff --git a/setup.py b/setup.py
@@ -29,8 +29,7 @@
       maintainer=MAINTAINER,
       maintainer_email=MAINTAINER_EMAIL,
       install_requires=[
-          "matplotlib", "numba", "numpy", "scipy",
-          "celer @ https://github.com/mathurinm/celer/archive/master.zip"],
+          "matplotlib", "numba", "numpy", "scipy", "celer>=0.6.1"],
       download_url=DOWNLOAD_URL,
       packages=find_packages(),
       )