From 4b487014d0de578ad9cc86c5a98fbc4c7a1d7f92 Mon Sep 17 00:00:00 2001 From: Marius Bergmann Date: Mon, 11 Jul 2016 23:01:57 +0200 Subject: [PATCH] Fix project for use within virtualenv - Use /usr/bin/env to determine path to python3 instead of a hard-coded path, so that virtualenv stubs work properly. - Change package name to 'boxes' ('boxes.py' did not work within virtualenv). --- boxes/__init__.py | 2 +- boxes/edges.py | 2 +- boxes/generators/_template.py | 2 +- boxes/generators/box.py | 2 +- boxes/generators/box2.py | 2 +- boxes/generators/box3.py | 2 +- boxes/generators/castle.py | 2 +- boxes/generators/drillbox.py | 2 +- boxes/generators/flexbox.py | 2 +- boxes/generators/flexbox2.py | 2 +- boxes/generators/flexbox3.py | 2 +- boxes/generators/flexbox4.py | 2 +- boxes/generators/flextest.py | 2 +- boxes/generators/folder.py | 2 +- boxes/generators/lamp.py | 2 +- boxes/generators/magazinefile.py | 2 +- boxes/generators/printer.py | 2 +- boxes/generators/silverwarebox.py | 2 +- boxes/generators/trayinsert.py | 2 +- boxes/generators/traylayout.py | 2 +- boxes/generators/typetray.py | 2 +- boxes/svgutil.py | 2 +- scripts/boxes | 2 +- scripts/boxesserver | 2 +- setup.py | 4 ++-- 25 files changed, 26 insertions(+), 26 deletions(-) diff --git a/boxes/__init__.py b/boxes/__init__.py index c0b70cd..30fe42b 100755 --- a/boxes/__init__.py +++ b/boxes/__init__.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/edges.py b/boxes/edges.py index 5fcee75..5497b82 100644 --- a/boxes/edges.py +++ b/boxes/edges.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Copyright (C) 2013-2016 Florian Festi # diff --git a/boxes/generators/_template.py b/boxes/generators/_template.py index 73e3d1a..0f0826b 100644 --- a/boxes/generators/_template.py +++ b/boxes/generators/_template.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2016 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/box.py b/boxes/generators/box.py index 2196fc4..b237b9f 100755 --- a/boxes/generators/box.py +++ b/boxes/generators/box.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/box2.py b/boxes/generators/box2.py index 43d7320..c7b2ede 100755 --- a/boxes/generators/box2.py +++ b/boxes/generators/box2.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/box3.py b/boxes/generators/box3.py index 56b4170..1a68303 100755 --- a/boxes/generators/box3.py +++ b/boxes/generators/box3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/castle.py b/boxes/generators/castle.py index c52045b..5c46116 100755 --- a/boxes/generators/castle.py +++ b/boxes/generators/castle.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/drillbox.py b/boxes/generators/drillbox.py index 55d982d..b19c4db 100755 --- a/boxes/generators/drillbox.py +++ b/boxes/generators/drillbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/flexbox.py b/boxes/generators/flexbox.py index ad440ed..e954d53 100755 --- a/boxes/generators/flexbox.py +++ b/boxes/generators/flexbox.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/flexbox2.py b/boxes/generators/flexbox2.py index af147a7..2fc8cc0 100755 --- a/boxes/generators/flexbox2.py +++ b/boxes/generators/flexbox2.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/flexbox3.py b/boxes/generators/flexbox3.py index d8eea52..a4c9941 100755 --- a/boxes/generators/flexbox3.py +++ b/boxes/generators/flexbox3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/flexbox4.py b/boxes/generators/flexbox4.py index a2cb239..dca9605 100644 --- a/boxes/generators/flexbox4.py +++ b/boxes/generators/flexbox4.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/flextest.py b/boxes/generators/flextest.py index fbc5c0e..4aa8d81 100755 --- a/boxes/generators/flextest.py +++ b/boxes/generators/flextest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/folder.py b/boxes/generators/folder.py index 5e1cd3a..306fb3d 100755 --- a/boxes/generators/folder.py +++ b/boxes/generators/folder.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/lamp.py b/boxes/generators/lamp.py index 12ac1c6..8fca779 100755 --- a/boxes/generators/lamp.py +++ b/boxes/generators/lamp.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/magazinefile.py b/boxes/generators/magazinefile.py index 4d509c5..1ce6578 100755 --- a/boxes/generators/magazinefile.py +++ b/boxes/generators/magazinefile.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/printer.py b/boxes/generators/printer.py index a98206e..379b249 100755 --- a/boxes/generators/printer.py +++ b/boxes/generators/printer.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/silverwarebox.py b/boxes/generators/silverwarebox.py index 1fb6ceb..aa05d50 100755 --- a/boxes/generators/silverwarebox.py +++ b/boxes/generators/silverwarebox.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/trayinsert.py b/boxes/generators/trayinsert.py index 594c3b6..e2221da 100755 --- a/boxes/generators/trayinsert.py +++ b/boxes/generators/trayinsert.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/traylayout.py b/boxes/generators/traylayout.py index add9236..cc94b58 100755 --- a/boxes/generators/traylayout.py +++ b/boxes/generators/traylayout.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2016 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/generators/typetray.py b/boxes/generators/typetray.py index bb57b98..ab11204 100755 --- a/boxes/generators/typetray.py +++ b/boxes/generators/typetray.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2013-2014 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/boxes/svgutil.py b/boxes/svgutil.py index 16c7ac9..5dd6fba 100755 --- a/boxes/svgutil.py +++ b/boxes/svgutil.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 # Copyright (C) 2016 Florian Festi # # This program is free software: you can redistribute it and/or modify diff --git a/scripts/boxes b/scripts/boxes index 9530437..d75a18d 100755 --- a/scripts/boxes +++ b/scripts/boxes @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import argparse import os diff --git a/scripts/boxesserver b/scripts/boxesserver index 83b88e3..f9ac809 100755 --- a/scripts/boxesserver +++ b/scripts/boxesserver @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 import sys import argparse diff --git a/setup.py b/setup.py index 370c848..364da4d 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,8 @@ -#!/usr/bin/python3 +#!/usr/bin/env python3 from setuptools import setup, find_packages -setup(name='boxes.py', +setup(name='boxes', version='0.1', description='Boxes generator for laser cutters', author='Florian Festi',