Fix merge conflicts. #2398

	---
	name: PyPI
	on: push
	jobs:
	build-n-publish-optimagic:
	name: Build and publish optimagic Python 🐍 distributions 📦 to PyPI
	runs-on: ubuntu-latest
	steps:
	- uses: actions/checkout@v4
	- name: Set up Python 3.10
	uses: actions/setup-python@v5
	with:
	python-version: '3.10'
	- name: Install pypa/build
	run: >-
	python -m
	pip install
	build
	--user
	- name: Build a binary wheel and a source tarball
	run: >-
	python -m
	build
	--sdist
	--wheel
	--outdir dist/
	- name: Publish distribution 📦 to PyPI
	if: startsWith(github.ref, 'refs/tags')
	uses: pypa/gh-action-pypi-publish@release/v1
	with:
	password: ${{ secrets.PYPI_API_TOKEN_OPTIMAGIC }}
	build-n-publish-estimagic:
	name: Build and publish estimagic Python 🐍 distributions 📦 to PyPI
	runs-on: ubuntu-latest
	steps:
	- uses: actions/checkout@v4
	- name: Set up Python 3.10
	uses: actions/setup-python@v5
	with:
	python-version: '3.10'
	- name: Install pypa/build
	run: >-
	python -m
	pip install
	build
	toml
	--user
	- name: Set name entry in pyproject.toml to estimagic
	run: >-
	python .tools/update_name_pyproject.py
	- name: Add FutureWarning to init files
	run: >-
	python .tools/update_init_files.py
	- name: Build a binary wheel and a source tarball
	run: >-
	python -m
	build
	--sdist
	--wheel
	--outdir dist/
	- name: Publish distribution 📦 to PyPI
	if: startsWith(github.ref, 'refs/tags')
	uses: pypa/gh-action-pypi-publish@release/v1
	with:
	password: ${{ secrets.PYPI_API_TOKEN }}

Provide feedback