develop replace with dev (#413)

LSSTDESC · Mar 3, 2023 · ebc7365 · ebc7365
1 parent 4f18840
commit ebc7365
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - develop
+      - dev
   pull_request:
     branches:
       - main
-      - develop
+      - dev
 
 jobs:
   build:

diff --git a/.github/workflows/notebooks.yml b/.github/workflows/notebooks.yml
@@ -6,7 +6,7 @@ on:
   push:
     branches:
       - main
-      - develop
+      - dev
 
 jobs:
   build:

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - main
-      - develop
+      - dev
   pull_request:
     branches:
       - main
-      - develop
+      - dev
 
 jobs:
   build:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ If you have any problems with the installation, they are probably due to `galsim
 
 ## Pull Requests
 
-1. Every contribution to BTK must be made in a form of a Pull Request (PR) can eventually be merged to the `develop` branch. (NOTE: Only the maintainer(s) can push to the `main` branch)
+1. Every contribution to BTK must be made in a form of a Pull Request (PR) can eventually be merged to the `dev` branch. (NOTE: Only the maintainer(s) can push to the `main` branch)
 
 2. Every pull request must pass the workflows specified in `.github/workflows` before merging.
 
@@ -43,10 +43,10 @@ If you have any problems with the installation, they are probably due to `galsim
 
     - If you get stuck by `pre-commit` errors, please ping us on your PR.
 
-3. If other branches were merged while you were working on this PR to the `develop` branch, then you will to rebase before merging:
+3. If other branches were merged while you were working on this PR to the `dev` branch, then you will to rebase before merging:
 
     ```bash
-    git rebase origin/develop
+    git rebase origin/dev
     # follow the instructions and resolve conflicts...
     # Feel free to ask other developers if you are not sure of the conflicts.
     git push --force

diff --git a/MAINTAINER.md b/MAINTAINER.md
@@ -44,17 +44,17 @@ pdm export -f requirements --without-hashes --pyproject --prod > requirements.tx
 # 0. Create release tag
 export RELEASE=XX.YY.ZZ
 
-# 1. Checked out into develop branch
-git checkout develop
+# 1. Checked out into dev branch
+git checkout dev
 
 # 2. Fetched all remote updates
 git remote update
 
-# 3. Update local develop branch with remote copy
-git pull origin develop
+# 3. Update local dev branch with remote copy
+git pull origin dev
 
-# 4. Created a release branch that tracks origin/develop
-git checkout -b release/$RELEASE origin/develop
+# 4. Created a release branch that tracks origin/dev
+git checkout -b release/$RELEASE origin/dev
 
 # 5. Bump version in release branch
 # edit pyproject.toml file to update the version
@@ -84,14 +84,14 @@ git push origin main
 # 13. Pushed the tags to remote repository
 git push origin --tags
 
-# 14. Checkout into develop branch
-git checkout develop
+# 14. Checkout into dev branch
+git checkout dev
 
-# 15. Merged release branch into develop branch
+# 15. Merged release branch into dev branch
 git merge release/$RELEASE
 
-# 16. Pushed develop branch to remote repository
-git push origin develop
+# 16. Pushed dev branch to remote repository
+git push origin dev
 
 # 17. Removed release branch from the local repository
 git branch -D release/$RELEASE
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,11 +4,11 @@ on: @@
       push:
         branches:
           - main
-          - develop
+          - dev
       pull_request:
         branches:
           - main
-          - develop
+          - dev
     jobs:
       build:
@@ Expand Down @@