From 2c503ab2a72b51534b54174644316ce24d53dce8 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Tue, 3 Oct 2023 11:05:37 -0400 Subject: [PATCH 1/5] pass elsize=1 to PyMem_Calloc --- MANIFEST.in | 2 +- news/calloc-signature | 19 +++++++++++++++++++ pycosat.c | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 news/calloc-signature diff --git a/MANIFEST.in b/MANIFEST.in index bc34207..f9dbeaf 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,4 +1,4 @@ include \ - setup.h CHANGELOG CODE_OF_CONDUCT.md HOW_WE_USE_GITHUB.md LICENSE \ + setup.h CHANGELOG.md CODE_OF_CONDUCT.md HOW_WE_USE_GITHUB.md LICENSE \ Makefile README.rst picosat.c picosat.h pycosat.c test_pycosat.py graft examples/ diff --git a/news/calloc-signature b/news/calloc-signature new file mode 100644 index 0000000..58f6e7a --- /dev/null +++ b/news/calloc-signature @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* Fix PyMem_Calloc() call signature + +### Deprecations + +* + +### Docs + +* + +### Other + +* diff --git a/pycosat.c b/pycosat.c index 6a5a174..4608213 100644 --- a/pycosat.c +++ b/pycosat.c @@ -271,7 +271,7 @@ static PyObject* itersolve(PyObject *self, PyObject *args, PyObject *kwds) if (it->picosat == NULL) return NULL; - it->mem = PyMem_Calloc(picosat_variables(it->picosat) + 1); + it->mem = PyMem_Calloc(picosat_variables(it->picosat) + 1, 1); if (it->mem == NULL) { PyErr_NoMemory(); return NULL; From 8f078354ee8c18f95764932489df82347caacda8 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Tue, 3 Oct 2023 11:06:22 -0400 Subject: [PATCH 2/5] bump version --- pycosat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pycosat.c b/pycosat.c index 4608213..13c6913 100644 --- a/pycosat.c +++ b/pycosat.c @@ -5,7 +5,7 @@ uses an MIT style license. */ #define PYCOSAT_URL "https://pypi.python.org/pypi/pycosat" -#define PYCOSAT_VERSION "0.6.5" +#define PYCOSAT_VERSION "0.6.6" #include From 0ac2ff7f40f28cc759921f0b46498ccc25266575 Mon Sep 17 00:00:00 2001 From: Ken Odegard Date: Tue, 3 Oct 2023 10:08:55 -0500 Subject: [PATCH 3/5] Update news/calloc-signature --- news/calloc-signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/calloc-signature b/news/calloc-signature index 58f6e7a..b789c8e 100644 --- a/news/calloc-signature +++ b/news/calloc-signature @@ -4,7 +4,7 @@ ### Bug fixes -* Fix PyMem_Calloc() call signature +* Fix `PyMem_Calloc()` call signature. (#76) ### Deprecations From 40308ab14b5e990d913ee05b8422c8228e5de04a Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Tue, 3 Oct 2023 11:13:54 -0400 Subject: [PATCH 4/5] Updated authorship for 0.6.6 --- .authors.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.authors.yml b/.authors.yml index 64c9bf6..7850848 100644 --- a/.authors.yml +++ b/.authors.yml @@ -23,12 +23,12 @@ - name: Ken Odegard email: kodegard@anaconda.com github: kenodegard - num_commits: 5 + num_commits: 9 first_commit: 2022-06-15 14:15:32 - name: Daniel Holth email: dholth@anaconda.com github: dholth - num_commits: 7 + num_commits: 9 first_commit: 2022-10-14 14:44:28 - name: Ilan Schnell email: ilanschnell@gmail.com From e8ff17f3bbec282e301944a1c077f193ba016ca2 Mon Sep 17 00:00:00 2001 From: Daniel Holth Date: Tue, 3 Oct 2023 11:13:54 -0400 Subject: [PATCH 5/5] Updated CHANGELOG for 0.6.6 --- CHANGELOG.md | 13 +++++++++++++ news/calloc-signature | 19 ------------------- 2 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 news/calloc-signature diff --git a/CHANGELOG.md b/CHANGELOG.md index 502c1df..75a2304 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ [//]: # (current developments) +## 0.6.6 (2023-10-03) + +### Bug fixes + +* Fix `PyMem_Calloc()` call signature. (#76) + +### Contributors + +* @dholth +* @kenodegard + + + ## 0.6.5 (2023-10-02) ### Enhancements diff --git a/news/calloc-signature b/news/calloc-signature deleted file mode 100644 index b789c8e..0000000 --- a/news/calloc-signature +++ /dev/null @@ -1,19 +0,0 @@ -### Enhancements - -* - -### Bug fixes - -* Fix `PyMem_Calloc()` call signature. (#76) - -### Deprecations - -* - -### Docs - -* - -### Other - -*