OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2464 from akva2/no_more_python3.5

Browse Source 
changed: python 3.5 is no longer support in pypi
This commit is contained in:
Joakim Hove 2021-05-08 20:13:10 +02:00 committed by GitHub
commit d50b5852e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
python/generate-pypi-package.sh
View File

@ -5,7 +5,6 @@
VERSION_TAG=${1:-""}
export PYTHON35=/opt/python/cp35-cp35m/bin/python
export PYTHON36=/opt/python/cp36-cp36m/bin/python
export PYTHON37=/opt/python/cp37-cp37m/bin/python
export PYTHON38=/opt/python/cp38-cp38/bin/python
@ -22,21 +21,16 @@ fi
mkdir build && cd build
cmake3 -DPYTHON_EXECUTABLE=${PYTHON35} -DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169 \
cmake3 -DPYTHON_EXECUTABLE=${PYTHON36} -DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169 \
-DOPM_ENABLE_PYTHON=ON -DOPM_PYTHON_PACKAGE_VERSION_TAG=${VERSION_TAG} -DBUILD_TESTING=0 ..
# make step is necessary until the generated ParserKeywords/*.hpp are generated in the Python step
make -j4
./setup-package.sh
${PYTHON35} -m auditwheel repair python/dist/*cp35*.whl
# Run setup-package.sh four times (Python 3.5, 3.6, 3.7 and 3.8)
cmake3 -DPYTHON_EXECUTABLE=${PYTHON36} -DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169 \
-DOPM_ENABLE_PYTHON=ON -DOPM_PYTHON_PACKAGE_VERSION_TAG=${VERSION_TAG} ..
./setup-package.sh
${PYTHON36} -m auditwheel repair python/dist/*cp36*.whl
# Run setup-package.sh three more times (Python 3.7, 3.8 and 3.9)
cmake3 -DPYTHON_EXECUTABLE=${PYTHON37} -DBOOST_INCLUDEDIR=/usr/include/boost169 -DBOOST_LIBRARYDIR=/usr/lib64/boost169 \
-DOPM_ENABLE_PYTHON=ON -DOPM_PYTHON_PACKAGE_VERSION_TAG=${VERSION_TAG} ..
./setup-package.sh

2
python/setup-docker-image.sh
View File

@ -13,8 +13,6 @@ yum install -y blas-devel suitesparse-devel trilinos-openmpi-devel
#${PYTHON27} -m pip install pip --upgrade
#${PYTHON27} -m pip install wheel setuptools twine pytest-runner auditwheel
${PYTHON35} -m pip install pip --upgrade
${PYTHON35} -m pip install wheel setuptools twine pytest-runner auditwheel
${PYTHON36} -m pip install pip --upgrade
${PYTHON36} -m pip install wheel setuptools twine pytest-runner auditwheel
${PYTHON37} -m pip install pip --upgrade