Skip to content

Commit a93765a

Browse files
authored
Merge pull request #2044 from metwork-framework/pip-24.3.1
build: merge integration branch
2 parents 7fe15f7 + cb02c69 commit a93765a

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

.metwork-framework/components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
| [pgbouncer](https://www.pgbouncer.org/) | 1.23.1 | scientific_core |
183183
| [pickleshare](https://github.com/pickleshare/pickleshare) | 0.7.5 | python3 |
184184
| [pika](https://pika.readthedocs.io) | 1.3.2 | python3 |
185-
| [pip](https://pip.pypa.io/) | 24.2 | python3_core |
185+
| [pip](https://pip.pypa.io/) | 24.3.1 | python3_core |
186186
| [pipdeptree](https://github.com/tox-dev/pipdeptree) | 2.13.1 | python3_devtools |
187187
| [platformdirs](https://github.com/platformdirs/platformdirs) | 3.10.0 | python3_core |
188188
| [pluggy](https://github.com/pytest-dev/pluggy) | 1.5.0 | python3_core |

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@
112112
- bump cryptography from 43.0.1 to 44.0.0 (#2032)
113113
- upgrade setuptools from 70.3.0 to 71.1.0 (#2034)
114114
- upgrade setuptools from 71.1.0 to 72.2.0 (#2035)
115+
- bump idna from 3.7 to 3.10 (#2036)
116+
- bump setuptools from 72.2.0 to 73.0.1 (#2037)
117+
- bump setuptools from 73.0.1 to 74.1.3 (#2038)
118+
- bump setuptools to 75.6.0 and wheel to 0.45.1 (#2039)
115119

116120
### Bug Fixes
117121

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
#pip 24.2 is the built-in versions in python 3.12.5
1+
#pip 24.3.1 is the built-in version in python 3.12.8
22
pip
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pip==24.2
1+
pip==24.3.1

layers/layer1_scientific_core/0010_hdf4/Makefile.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@ WEBSITE=https://www.hdfgroup.org
1313
LICENSE=BSD
1414
export EXPLICIT_NAME=$(NAME)-hdf$(VERSION)
1515

16-
all:: $(PREFIX)/lib/libdf.so $(PREFIX)/include/hdfi.h
16+
#all:: $(PREFIX)/lib/libdf.so $(PREFIX)/include/hdfi.h
17+
all:: $(PREFIX)/lib/libdf.so
1718
$(PREFIX)/lib/libdf.so:
1819
$(MAKE) --file=../../Makefile.standard PREFIX=$(PREFIX) EXPLICIT_NAME=$(EXPLICIT_NAME) EXTRACFLAGS="-I$(PREFIX)/../core/include" EXTRALDFLAGS="-L$(PREFIX)/../core/lib" OPTIONS="--enable-shared --disable-static --disable-netcdf --disable-java --disable-fortran --with-szlib" download uncompress configure build install
19-
#add hdfi.h for compatibility (pyhdf <= 0.11.4 is using hdfi.h, next release will not do so)
20-
$(PREFIX)/include/hdfi.h:
21-
cd $(PREFIX)/include && ln -s hdf.h hdfi.h
20+
21+
#hdfi.h for compatibility hdf4 4.3.0 is not required anymore (pyhdf 0.11.4 was using hdfi.h, 0.11.6 uses hdf.h)
22+
#$(PREFIX)/include/hdfi.h:
23+
# cd $(PREFIX)/include && ln -s hdf.h hdfi.h

0 commit comments

Comments
 (0)