From 6a537781fdcca3be8ace81c5cfbfcc8cde8fd9ff Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Sat, 8 Jun 2024 12:09:31 +0200 Subject: [PATCH 1/2] chore: Update default pixi gitignore and gitattributes --- .gitattributes | 2 +- .gitignore | 4 ++-- src/cli/init.rs | 6 ++---- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index fbfdc128a..18f6c7e96 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -pixi.lock linguist-language=YAML +pixi.lock linguist-language=YAML linguist-generated=true diff --git a/.gitignore b/.gitignore index fd14dbfb0..daf8a4e60 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ .vscode .test-projects __pycache__ -**/**/.pixi -**/**/.build +**/.pixi/envs +**/.build .DS_store site/ .cache diff --git a/src/cli/init.rs b/src/cli/init.rs index c304184c0..c615c9cc4 100644 --- a/src/cli/init.rs +++ b/src/cli/init.rs @@ -123,14 +123,12 @@ platforms = {{ platforms }} "#; const GITIGNORE_TEMPLATE: &str = r#"# pixi environments -.pixi +**/.pixi/envs *.egg-info - "#; const GITATTRIBUTES_TEMPLATE: &str = r#"# GitHub syntax highlighting -pixi.lock linguist-language=YAML - +pixi.lock linguist-language=YAML linguist-generated=true "#; pub async fn execute(args: Args) -> miette::Result<()> { From 2beee00341a8e6be7faeaf641d158d9ca2a187a1 Mon Sep 17 00:00:00 2001 From: Pavel Zwerschke Date: Mon, 10 Jun 2024 10:47:43 +0200 Subject: [PATCH 2/2] Update gitignore --- .gitignore | 4 ++-- src/cli/init.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index daf8a4e60..51b0f4073 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,8 @@ .vscode .test-projects __pycache__ -**/.pixi/envs -**/.build +.pixi +.build .DS_store site/ .cache diff --git a/src/cli/init.rs b/src/cli/init.rs index c615c9cc4..95ed9e765 100644 --- a/src/cli/init.rs +++ b/src/cli/init.rs @@ -123,7 +123,7 @@ platforms = {{ platforms }} "#; const GITIGNORE_TEMPLATE: &str = r#"# pixi environments -**/.pixi/envs +.pixi *.egg-info "#;