Fix SETUP_PACKAGES list end element in setup.py

[mweinelt]

and switch over to a less error-prone list and dict style, where the closing element is not on the same line as an item.

I would recommend moving to a pyproject.toml at this point. https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html