From 21aab885e511dfa74093cfa3930fac31ed6a6cd1 Mon Sep 17 00:00:00 2001 From: lukelabrie Date: Fri, 19 May 2023 16:26:32 +0200 Subject: [PATCH 1/6] python3.11 compatibility --- .github/workflows/build.yml | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 374cc8f..63c4ba2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: False matrix: - python-version: [ 3.7, 3.8, 3.9, '3.10' ] + python-version: [ 3.8, 3.8, '3.10', '3.11' ] steps: - name: Checkout repository uses: actions/checkout@v2 @@ -60,22 +60,22 @@ jobs: with: submodules: true - - name: Setup Python 3.9 + - name: Setup Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.9 + python-version: 3.10 - name: Build wheels env: # only build CPython-3.6 and later and skip 32-bit builds and skip windows - CIBW_BUILD: cp37-* cp38-* cp39-* cp310-* + CIBW_BUILD: cp38-* cp39-* cp310-* cp311-* CIBW_SKIP: "*-win* *-manylinux_i686 *-musllinux*" # 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 + python -m pip install -U pip cibuildwheel python -m cibuildwheel --output-dir dist ls -R dist @@ -91,7 +91,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest, macos-latest ] - python-version: [ 3.7, 3.8, 3.9, '3.10' ] + python-version: [ 3.8, 3.9, 3.10, '3.11' ] steps: - name: Checkout repository diff --git a/setup.py b/setup.py index 9318b52..8ab8aca 100644 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ setup( version=version, - install_requires=["numpy >=1.14"], + install_requires=["numpy >=1.18.5"], ext_modules=[NLOptBuildExtension("nlopt._nlopt", version)], cmdclass={"build_ext": NLOptBuild}, zip_safe=False, From 9b16857c3fc263669c33e8d24dc4f60dfa83ec81 Mon Sep 17 00:00:00 2001 From: lukelabrie Date: Fri, 19 May 2023 16:34:22 +0200 Subject: [PATCH 2/6] quotes around version number --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 63c4ba2..565b058 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: - name: Setup Python 3.10 uses: actions/setup-python@v2 with: - python-version: 3.10 + python-version: '3.10' - name: Build wheels env: @@ -91,7 +91,7 @@ jobs: strategy: matrix: os: [ windows-latest, ubuntu-latest, macos-latest ] - python-version: [ 3.8, 3.9, 3.10, '3.11' ] + python-version: [ 3.8, 3.9, '3.10', '3.11' ] steps: - name: Checkout repository From 756bd262a203a548e137837038bec86caa6ddefc Mon Sep 17 00:00:00 2001 From: lukelabrie Date: Fri, 19 May 2023 17:18:04 +0200 Subject: [PATCH 3/6] force reinstall swig --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 565b058..0793688 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install SWIG - run: choco install swig -y + run: choco install --force swig -y - name: Build wheels run: | From 851181e76c942306dc90f8516626ede6c3adeb75 Mon Sep 17 00:00:00 2001 From: lukelabrie Date: Fri, 19 May 2023 17:29:12 +0200 Subject: [PATCH 4/6] update swig version in dockerfile --- .github/workflows/build.yml | 2 +- ci/nlopt_manylinux2014_x86_64.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0793688..565b058 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: python-version: ${{ matrix.python-version }} - name: Install SWIG - run: choco install --force swig -y + run: choco install swig -y - name: Build wheels run: | diff --git a/ci/nlopt_manylinux2014_x86_64.Dockerfile b/ci/nlopt_manylinux2014_x86_64.Dockerfile index f4490a6..fbd4d65 100644 --- a/ci/nlopt_manylinux2014_x86_64.Dockerfile +++ b/ci/nlopt_manylinux2014_x86_64.Dockerfile @@ -4,7 +4,7 @@ FROM quay.io/pypa/manylinux2014_x86_64:2023-02-05-56647d4 # 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 && \ + curl -L https://sourceforge.net/projects/swig/files/swig/swig-4.1.1/swig-4.1.1.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 && \ From 2af96df23bd0b3464f1c4be3842f33547e8e9d92 Mon Sep 17 00:00:00 2001 From: Luke Labrie-Cleary Date: Wed, 7 Jun 2023 23:13:02 -0400 Subject: [PATCH 5/6] Update build.yml remove duplicate python3.8 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 565b058..d25a6e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: strategy: fail-fast: False matrix: - python-version: [ 3.8, 3.8, '3.10', '3.11' ] + python-version: [ 3.8, 3.9, '3.10', '3.11' ] steps: - name: Checkout repository uses: actions/checkout@v2 From 76939e0f17f2065cb3c4ea92aafac9d7af55928a Mon Sep 17 00:00:00 2001 From: Luke Labrie-Cleary Date: Thu, 8 Jun 2023 10:44:27 -0400 Subject: [PATCH 6/6] Update build.yml fix python version for deploy step --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d25a6e7..ccc207e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -139,10 +139,10 @@ jobs: if: startsWith(github.ref, 'refs/tags/') steps: - - name: Setup Python ${{ matrix.python-version }} + - name: Setup Python uses: actions/setup-python@v2 with: - python-version: ${{ matrix.python-version }} + python-version: '3.8' - name: Retrieve packages uses: actions/download-artifact@v2