diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a607c6c8ea3f4dfa7e6ecb10cf787cc4c78e664..add86a402fd09f1e205b59f9cda93778ed20a693 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ build-3.9-linux: paths: - dist3/ -build-3.5-macos: +build-3.9-macos: stage: build tags: @@ -44,7 +44,7 @@ build-3.5-macos: GIT_SUBMODULE_STRATEGY: recursive script: - export PATH=/opt/local/bin:$PATH - - virtualenv -p python3.5 . + - virtualenv -p python3.9 . - source bin/activate - python setup.py bdist_wheel --dist-dir dist3 artifacts: @@ -67,22 +67,6 @@ build-3.9-macos-m1: paths: - dist3/ -build-2.7-macos: - stage: - build - tags: - - Apple - variables: - GIT_SUBMODULE_STRATEGY: recursive - script: - - export PATH=/opt/local/bin:$PATH - - virtualenv -p python2.7 . - - source bin/activate - - python setup.py bdist_wheel --dist-dir dist2 - artifacts: - paths: - - dist2/ - test-3.9-VS2017: stage: test @@ -110,17 +94,17 @@ test-3.9-linux: - cd tests - python -m unittest discover -test-3.5-macos: +test-3.9-macos: stage: test tags: - Apple dependencies: - - build-3.5-macos - needs: [build-3.5-macos] + - build-3.9-macos + needs: [build-3.9-macos] script: - export PATH=/opt/local/bin:$PATH - - virtualenv -p python3.5 . + - virtualenv -p python3.9 . - source bin/activate - pip install dist3/*.whl - cd tests @@ -141,22 +125,6 @@ test-3.9-macos-m1: - pip install dist3/*.whl - cd tests - python -m unittest discover - -test-2.7-macos: - stage: - test - tags: - - Apple - dependencies: - - build-2.7-macos - needs: [build-2.7-macos] - script: - - export PATH=/opt/local/bin:$PATH - - virtualenv -p python2.7 . - - source bin/activate - - pip install dist2/*.whl - - cd tests - - python -m unittest discover deploy-3.9-VS2017: stage: @@ -187,14 +155,14 @@ deploy-3.9-linux: paths: - release/*.whl -deploy-3.5-macos: +deploy-3.9-macos: stage: deploy tags: - Apple dependencies: - - build-3.5-macos - needs: [build-3.5-macos] + - build-3.9-macos + needs: [build-3.9-macos] script: - mkdir release - cp dist3/*.whl release @@ -217,21 +185,6 @@ deploy-3.9-macos-m1: paths: - release/*.whl -deploy-2.7-macos: - stage: - deploy - tags: - - Apple - dependencies: - - build-2.7-macos - needs: [build-2.7-macos] - script: - - mkdir release - - cp dist2/*.whl release - artifacts: - paths: - - release/*.whl - deploy-sdist: stage: deploy diff --git a/pybind11 b/pybind11 index f1abf5d9159b805674197f6bc443592e631c9130..2dd52544942be4bef80811ef18c8fcf1d3c7e246 160000 --- a/pybind11 +++ b/pybind11 @@ -1 +1 @@ -Subproject commit f1abf5d9159b805674197f6bc443592e631c9130 +Subproject commit 2dd52544942be4bef80811ef18c8fcf1d3c7e246