Update instance repo from cookiecutter template

scverse · Aug 25, 2023 · 9fc5fee · 9fc5fee
1 parent 8253a57
commit 9fc5fee
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 6 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -5,8 +5,6 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
-  schedule:
-    - cron: "0 5 1,15 * *"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -39,9 +39,6 @@ repos:
         args: [--fix=lf]
       - id: trailing-whitespace
       - id: check-case-conflict
-      # Check that there are no merge conflicts (could be generated by template sync)
-      - id: check-merge-conflict
-        args: [--assume-in-merge]
   - repo: local
     hooks:
       - id: forbid-to-commit

diff --git a/pyproject.toml b/pyproject.toml
@@ -26,7 +26,6 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-    # CLI for bumping the version number
     "pre-commit",
     "twine>=4.0.2"
 ]