From 8353c9bdf5e68defd536e6ebc9d0dd8b32cf8f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Wed, 10 Jun 2015 17:25:23 +0200 Subject: [PATCH] Better fix for #931, stays backwards compatible to older setuptools versions python-setuptools on OctoPi is quite old and trying to update in a local virtualenv apparently CAN cause problems (we had this with python-serial too a while back), so a backwards compatible solution is better here. --- setup.py | 1 - src/octoprint_setuptools/__init__.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 83a88299..7fff74ec 100644 --- a/setup.py +++ b/setup.py @@ -13,7 +13,6 @@ import octoprint_setuptools # Requirements for our application INSTALL_REQUIRES = [ - "setuptools==7.0", "flask>=0.9,<0.11", "werkzeug==0.8.3", "tornado==4.0.1", diff --git a/src/octoprint_setuptools/__init__.py b/src/octoprint_setuptools/__init__.py index 3c4039ea..ff698dee 100644 --- a/src/octoprint_setuptools/__init__.py +++ b/src/octoprint_setuptools/__init__.py @@ -491,7 +491,8 @@ def create_plugin_setup_parameters(identifier="todo", name="TODO", version="0.1" cmdclass.update(get_babel_commandclasses(pot_file=pot_file, output_dir=translation_dir, bundled_dir=bundled_dir, pack_name_prefix="{name}-i18n-".format(**locals()), pack_path_prefix="_plugins/{identifier}/".format(**locals()))) from setuptools import find_packages - packages = find_packages(where=source_folder, exclude=ignored_packages, include=[package, "{package}.*".format(**locals())] + additional_packages) + packages = list(set([package] + filter(lambda x: x.startswith("{package}.".format(package=package)), find_packages(where=source_folder, exclude=ignored_packages)) + additional_packages)) + print("Found packages: {packages!r}".format(**locals())) return dict( name=name,