Commit ccdbb42

authored

fix: add gcc10 to AL2 image; build numpy and pandas from source (#3069)

1 parent 9e319f0 commit ccdbb42Copy full SHA for ccdbb42

File tree

+16

-3

lines changed

+16

-3

lines changed

Lines changed: 14 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ RUN yum install -y \`
`10`	`10`	`libxslt-devel \`
`11`	`11`	`bison \`
`12`	`12`	`make \`
`13`		`- gcc \`
`14`		`- gcc-c++ \`
	`13`	`+ gcc10 \`
	`14`	`+ gcc10-c++ \`
`15`	`15`	`flex \`
`16`	`16`	`autoconf \`
`17`	`17`	`zip \`
`@@ -20,12 +20,24 @@ RUN yum install -y \`
`20`	`20`
`21`	`21`	`WORKDIR /root`
`22`	`22`
	`23`	`+ENV CC=/usr/bin/gcc10-cc`
	`24`	`+ENV CXX=/usr/bin/gcc10-c++`
	`25`	`+ENV LD=/usr/bin/gcc10-gcc`
	`26`	`+`
	`27`	`+RUN ln -s /usr/bin/gcc10-gcc /usr/bin/gcc`
	`28`	`+RUN ln -s /usr/bin/gcc10-g++ /usr/bin/g++`
	`29`	`+RUN ln -s /usr/bin/gcc10-nm /usr/bin/nm`
	`30`	`+RUN ln -s /usr/bin/gcc10-ar /usr/bin/ar`
	`31`	`+RUN ln -s /usr/bin/gcc10-mpn /usr/bin/mpn`
	`32`	`+RUN ln -s /usr/bin/gcc10-ld /usr/bin/ld`
	`33`	`+`
`23`	`34`	`FROM ${python_version}`
`24`	`35`	`COPY pyproject.toml poetry.lock ./`
`25`	`36`
`26`	`37`	`RUN pip3 install --upgrade pip wheel setuptools>=64 setuptools_scm>=8`
`27`	`38`	`RUN pip3 install --upgrade urllib3==1.26.16 # temporary to avoid https://github.com/urllib3/urllib3/issues/2168 (TODO remove when the AL2 image updates to support OpenSSL 1.1.1+)`
`28`	`39`	`RUN pip3 install --upgrade six cython cmake hypothesis poetry`
	`40`	`+ENV PIP_NO_BINARY="numpy,pandas"`
`29`	`41`	`RUN poetry config virtualenvs.create false --local && poetry install --no-root --only main`
`30`	`42`
`31`	`43`	`RUN rm -f pyproject.toml poetry.lock`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ COPY pyproject.toml poetry.lock ./`
`25`	`25`
`26`	`26`	`RUN pip3 install --upgrade pip wheel setuptools>=64 setuptools_scm>=8`
`27`	`27`	`RUN pip3 install --upgrade six cython cmake hypothesis poetry`
	`28`	`+ENV PIP_NO_BINARY="numpy,pandas"`
`28`	`29`	`RUN poetry config virtualenvs.create false --local && poetry install --no-root --only main`
`29`	`30`
`30`	`31`	`RUN rm -f pyproject.toml poetry.lock`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ popd`
`83`	`83`
`84`	`84`	`pushd /aws-sdk-pandas`
`85`	`85`
`86`		`-pip3 install . -t ./python ".[redshift,mysql,postgres,gremlin,opensearch,openpyxl]"`
	`86`	`+pip3 install . --no-binary numpy,pandas -t ./python ".[redshift,mysql,postgres,gremlin,opensearch,openpyxl]"`
`87`	`87`
`88`	`88`	`rm -rf python/pyarrow*`
`89`	`89`	`rm -rf python/boto*`

Comments

(0)