Merge pull request #6 from DanielBok/develop/2.7.0

NLOpt 2.7.0

Author: DanielBok

.github/workflows/build.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: False
       matrix:
-        python-version: [ 3.6, 3.7, 3.8 ]
+        python-version: [ 3.6, 3.7, 3.8, 3.9 ]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -60,33 +60,22 @@ jobs:
         with:
           submodules: true
 
-      - name: Setup Python 3.8
+      - name: Setup Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Build wheels
         env:
           # only build CPython-3.6 and later and skip 32-bit builds and skip windows
-          CIBW_BUILD: cp36-* cp37-* cp38-*
+          CIBW_BUILD: cp36-* cp37-* cp38-* cp39-*
           CIBW_SKIP: "*-win* *-manylinux_i686"
-          CIBW_BEFORE_ALL_LINUX: |
-            yum update -y && yum install pcre-devel cmake3 -y
-            yum remove cmake -y
-            ln -s /usr/bin/cmake3 /usr/bin/cmake
-
-            if [[ ! -e $(command -v swig) ]]; then
-              curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.0.2/swig-4.0.2.tar.gz/download --output /tmp/swig.tar.gz
-              mkdir /tmp/swig
-              tar -xvzf /tmp/swig.tar.gz -C /tmp/swig --strip-components 1 &> /dev/null
-              pushd /tmp/swig
-              ./configure --without-alllang --with-python3 && make -j2 && make install > /dev/null
-              popd
-            fi
+          # use latest build
+          CIBW_MANYLINUX_X86_64_IMAGE: danielbok/nlopt_manylinux2014_x86_64:latest
           CIBW_BEFORE_ALL_MACOS: brew install swig
           CIBW_BEFORE_BUILD: pip install numpy
         run: |
-          pip install -U pip cibuildwheel==1.5.1
+          pip install -U pip cibuildwheel==1.7.2
           python -m cibuildwheel --output-dir dist
 
       - name: Place wheels in artifacts folder
@@ -95,13 +84,13 @@ jobs:
           path: ./dist/*.whl
 
   test-wheels:
-    name: Test package installation
+    name: Test wheels
     needs: [ build_wheels_windows, build_wheels_unix ]
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest, macos-latest ]
-        python-version: [ 3.6, 3.7, 3.8 ]
+        python-version: [ 3.6, 3.7, 3.8, 3.9 ]
 
     steps:
       - name: Checkout repository
@@ -122,6 +111,9 @@ jobs:
         run: |
           python -m pip install --upgrade pip
 
+          # list all files in the dist folder
+          ls -R dist
+
           # finds path to the right wheel or source file to install later
           os=$(echo ${{ runner.os }} | awk '{print tolower($0)}' | head -c3)
 
@@ -133,6 +125,8 @@ jobs:
           # nlopt-2.6.2-cp36-cp36m-manylinux10_amd64.whl
           file=$(find dist -name "nlopt-*${version}*${os}*.whl" -type f);
 
+          echo "Installing file: ${file}"
+
           pip install ${file}
           python extern/nlopt/test/t_python.py
 

.github/workflows/manylinux-image.yml

@@ -0,0 +1,46 @@
+name: Build and push manylinux image
+
+on:
+  push:
+    branches:
+      - master
+      - image/*
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get current time
+        uses: 1466587594/get-current-time@v2
+        id: current-time
+        with:
+          format: YYYYMMDD
+
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: danielbok
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        id: docker_build
+        with:
+          context: ci
+          file: ci/nlopt_manylinux2014_x86_64.Dockerfile
+          push: github.ref == 'refs/heads/master'
+          tags: |
+            danielbok/nlopt_manylinux2014_x86_64:latest
+            danielbok/nlopt_manylinux2014_x86_64:${{ steps.current-time.outputs.formattedTime }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

ci/nlopt_manylinux2014_x86_64.Dockerfile

@@ -0,0 +1,12 @@
+FROM quay.io/pypa/manylinux2014_x86_64:2020-12-25-6634688
+
+# cmake already version 3, thus no need to update cmake
+
+# add swig
+RUN yum update -y && \
+    curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.0.2/swig-4.0.2.tar.gz/download --output /tmp/swig.tar.gz && \
+    mkdir -p /tmp/swig && \
+    tar -xvzf /tmp/swig.tar.gz -C /tmp/swig --strip-components 1 &> /dev/null && \
+    pushd /tmp/swig && \
+    ./configure --without-alllang --with-python3 && make -j2 && make install > /dev/null && \
+    popd

extern/nlopt

@@ -13,13 +13,10 @@ description = Library for nonlinear optimization, wrapping many algorithms for g
 long_description = file: README.md
 long_description_content_type = text/markdown
 keywords =
-    copula
-    copulae
-    dependency modelling
-    dependence structures
-    archimdean
-    elliptical
-    finance
+    algorithms
+    global local constrained unconstrained optimization
+    optimization
+    non-linear optimization
 classifiers =
     Development Status :: 5 - Production
     Intended Audience :: End Users/Desktop
@@ -32,6 +29,7 @@ classifiers =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
     Topic :: Scientific/Engineering
 
 [options]