pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Better fix for #931, stays backwards compatible to older setuptools versions

Browse source 
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.
This commit is contained in:
Gina Häußge 2015-06-10 17:25:23 +02:00
parent 6a7a858065
commit 8353c9bdf5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
setup.py
View file

@ -13,7 +13,6 @@ import octoprint_setuptools
# Requirements for our application # Requirements for our application
INSTALL_REQUIRES = [ INSTALL_REQUIRES = [
"setuptools==7.0",
"flask>=0.9,<0.11", "flask>=0.9,<0.11",
"werkzeug==0.8.3", "werkzeug==0.8.3",
"tornado==4.0.1", "tornado==4.0.1",

3
src/octoprint_setuptools/__init__.py
View file

@ -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()))) 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 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( return dict(
name=name, name=name,