From adc99c64ff9c6910428760830ef64120b279df19 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Thu, 4 Jan 2024 12:31:23 -0600 Subject: [PATCH 1/3] Updated authorship for 3.28.3 --- .authors.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.authors.yml b/.authors.yml index b22e4b31e4..4e6c03865d 100644 --- a/.authors.yml +++ b/.authors.yml @@ -1201,7 +1201,7 @@ alternate_emails: - clee@anaconda.com - name: Ken Odegard - num_commits: 155 + num_commits: 158 email: kodegard@anaconda.com first_commit: 2020-09-08 19:53:41 github: kenodegard From 9000e57c9763f313064179d9b0e3ecc34a943300 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Thu, 4 Jan 2024 12:31:24 -0600 Subject: [PATCH 2/3] Updated CHANGELOG for 3.28.3 --- CHANGELOG.md | 13 +++++++++++++ news/5124-fix-ensure_binary-None-handling | 19 ------------------- news/5126-samefile-regression | 19 ------------------- 3 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 news/5124-fix-ensure_binary-None-handling delete mode 100644 news/5126-samefile-regression diff --git a/CHANGELOG.md b/CHANGELOG.md index dfc774b884..e1959fcdd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ [//]: # (current developments) +## 3.28.3 (2024-01-04) + +### Bug fixes + +* Update `conda_build.os_utils.liefldd.ensure_binary` to handle `None` inputs. (#5123 via #5124) +* Update `which_package` to use a cached mapping of files to packages (`O(1)`) instead of relying on `Path.samefile` comparisons (`O(n * m)`). (#5126 via #5130) + +### Contributors + +* @kenodegard + + + ## 3.28.2 (2023-12-15) ### Enhancements diff --git a/news/5124-fix-ensure_binary-None-handling b/news/5124-fix-ensure_binary-None-handling deleted file mode 100644 index edd4b9d9a4..0000000000 --- a/news/5124-fix-ensure_binary-None-handling +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Update `conda_build.os_utils.liefldd.ensure_binary` to handle `None` inputs. (#5123 via #5124) - -### Deprecations - -* - -### Docs - -* - -### Other - -* diff --git a/news/5126-samefile-regression b/news/5126-samefile-regression deleted file mode 100644 index e3ec790882..0000000000 --- a/news/5126-samefile-regression +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Update `which_package` to use a cached mapping of files to packages (`O(1)`) instead of relying on `Path.samefile` comparisons (`O(n * m)`). (#5126 via #5130) - -### Deprecations - -* - -### Docs - -* - -### Other - -* From da807ad2a9002f0a510d99c73f1951dcb78dc73a Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Thu, 4 Jan 2024 12:34:20 -0600 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e1959fcdd1..e376dc1422 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Bug fixes * Update `conda_build.os_utils.liefldd.ensure_binary` to handle `None` inputs. (#5123 via #5124) -* Update `which_package` to use a cached mapping of files to packages (`O(1)`) instead of relying on `Path.samefile` comparisons (`O(n * m)`). (#5126 via #5130) +* Update `conda_build.inspect_pkg.which_package` to use a cached mapping of paths to packages (first call: `O(n)`, subsequent calls: `O(1)`) instead of relying on `Path.samefile` comparisons (`O(n * m)`). (#5126 via #5130) ### Contributors