pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3581 commits 20 branches 22 tags 141 MiB
Commit graph

74 commits

Author SHA1 Message Date
Gina Häußge
54fe75fb4e Merge branch 'improve/aboutDialog' into devel 
Conflicts:
	.gitignore
	THIRDPARTYLICENSES.md
	setup.py
	src/octoprint/plugins/virtual_printer/virtual.py
	src/octoprint/server/__init__.py
	src/octoprint/server/util/flask.py
	src/octoprint/server/views.py
	src/octoprint/settings.py
	src/octoprint/templates/dialogs/about/about.jinja2
	src/octoprint/templates/index.jinja2
 2016-04-21 12:10:03 +02:00
Gina Häußge
5e6a7ef605 Added sponsor list 2016-04-21 11:56:56 +02:00
Gina Häußge
e0b888b2d0 First throw at an "About" dialog 
(cherry picked from commit f2c07e8)
 2016-04-19 16:41:30 +02:00
Gina Häußge
05ce46ccc4 Update click and cookiecutter dependencies 2016-03-23 10:40:09 +01:00
Gina Häußge
e4828450c9 Merge branch 'fix/slugifyFilenames' into devel 
Conflicts:
	setup.py
 2016-01-11 16:43:38 +01:00
Gina Häußge
7743372ee4 Slugify file names on local storage 
Just stripping anything non-ASCII leads to errors with UTF-8 only
filenames.

Closes #1181
 2016-01-11 16:42:05 +01:00
Gina Häußge
43420163db Fixed some pinned versions for dependencies, introduced upper bounds 2015-11-19 10:48:06 +01:00
Gina Häußge
b326efbc3c Merge branch 'devel' into dev/click 
Conflicts:
	setup.py
	src/octoprint/__init__.py
	src/octoprint/plugin/core.py
	src/octoprint/server/__init__.py
 2015-10-26 13:47:17 +01:00
Gina Häußge
55075d40bc Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	setup.cfg
	src/octoprint/_version.py
	src/octoprint/plugin/types.py
	src/octoprint/util/__init__.py
	versioneer.py
 2015-10-26 09:23:19 +01:00
Gina Häußge
2a8e084b51 Added a missing comma that broke the build... 2015-10-23 13:27:24 +02:00
Gina Häußge
ce00a069fa Added conversion for README.md to rst for PyPi 2015-10-23 12:08:36 +02:00
Gina Häußge
9ce9af28c3 Updating versioneer & switch to PEP440 versioning 
(cherry picked from commit 137db0b)
 2015-10-23 09:51:50 +02:00
Gina Häußge
c55fea666d Updated required versions of psutil and netifaces 
Also see #1090
 2015-10-19 09:33:48 +02:00
Gina Häußge
22509f02b5 Make sure to include testballoon package in install 2015-09-29 14:23:10 +02:00
Gina Häußge
a05e3a44af Updated tornado, sockjs-tornado and psutil dependencies 2015-09-21 15:00:06 +02:00
Marcel Hellwig
e46e7b3ee2 changed magic line from python->python2 
Since python is sometimes (and for me on arch linux) a symlink to the
python3 utils, you should be more explicit with that.
 2015-09-17 18:04:14 +02:00
Gina Häußge
f2c07e8f96 First throw at an "About" dialog 2015-09-03 17:08:15 +02:00
Gina Häußge
540cf4f4d9 Merge branch 'maintenance' into devel 
Conflicts:
	.versioneer-lookup
	CHANGELOG.md
 2015-09-02 20:19:29 +02:00
Gina Häußge
455474841e Pinned psutil version to 3.1.1 (and all other dependencies) 
Something in the recently released psutil 3.2.0 version causes installations via
python setup.py install to fail that list psutil as requirement.

Pinning to 3.1.1 solves that problem for now.
 2015-09-02 19:38:18 +02:00
Gina Häußge
0e863ad776 Made diskspace running low a bit more obvious 
* Added "total" space to "free" in file list
  * Added configurable space thresholds. If free space is below "warning"
    threshold, exclamation sign will be added to report. If free space is below
    "critical" threshold, report will be styled bold and red.
(cherry picked from commit 097800a)
 2015-08-27 17:14:10 +02:00
Gina Häußge
097800ae9c Made diskspace running low a bit more obvious 
* Added "total" space to "free" in file list
  * Added configurable space thresholds. If free space is below "warning"
    threshold, exclamation sign will be added to report. If free space is below
    "critical" threshold, report will be styled bold and red.
 2015-08-27 10:29:11 +02:00
Gina Häußge
a65ad50898 Better command line interface 2015-07-13 13:51:36 +02:00
Gina Häußge
137db0b17c Updating versioneer & switch to PEP440 versioning 2015-06-29 17:27:15 +02:00
Gina Häußge
8353c9bdf5 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.
 2015-06-10 17:25:23 +02:00
Gina Häußge
6a7a858065 Fix: octoprint_setuptools depends on setuptools==7.0 
Closes #931
 2015-06-10 16:34:12 +02:00
Gina Häußge
261f6709a3 Depend on Flask-Assets 0.10 
Compatibility adjustments and version pinning
 2015-06-03 19:36:38 +02:00
Gina Häußge
157b78a052 WIP: Use Flask-Assets to merge js, css and less files 
Should reduce number of requests and hence load times needed for loading web interface.

TODO: Handling of empty bundles needs to be fixed
 2015-06-03 16:42:57 +02:00
Gina Häußge
02b7085543 Merge branch 'dev/translationsAsPackages' into devel 
Conflicts:
	src/octoprint/server/__init__.py
 2015-06-02 13:58:40 +02:00
Gina Häußge
5904d01bff Unbundled translations, added new tools to bundle and pack translations 
The only translation that is going to be bundled with OctoPrint for now will be .de, if at all. The reason simply being that this is the only translation I can update myself and hence guarantee a good user experience for.

setup.py now offers two new commands, babel_bundle and babel_pack, with which translations for plugins and core OctoPrint can be automatically bundled or packed as language packs once compiled. This should make sharing translations quite easy in the future.
 2015-06-02 13:38:08 +02:00
Gina Häußge
e8c37287fe Forgot a dependency for the bundled plugin manager 
Thanks to @Salandora for the heads-up
 2015-05-31 11:10:40 +02:00
Gina Häußge
caef322b65 The Plugin Manager is now bundled with OctoPrint 2015-05-29 16:31:43 +02:00
Gina Häußge
45cda586d2 Fix: Make pip install -e . work properly by linking to ./src, not ./ 2015-05-13 08:37:36 +02:00
Gina Häußge
24a020a5f0 Added "plugins" extra to OctoPrint 
Installs dependencies necessary/recommended for plugin development. At the moment that is only cookiecutter.
 2015-05-12 21:38:04 +02:00
Gina Häußge
37ee1d6780 octoprint.setuptools => octoprint_setuptools (own package) 
Otherwise we get import issues during build since the octoprint module depends on the dependencies already being present what they obviously can't be at the beginning of setup.
 2015-05-12 20:36:38 +02:00
Gina Häußge
05fd4fbc8a Some final touches to the new setuptools submodule 
CleanCommand should never touch .git subfolders. Plugin CleanCommand should remove plugin's egg-info files
 2015-05-12 17:34:00 +02:00
Gina Häußge
95062747ef Extracted setuptools related things into reusable package 
Babel related commands and the Clean command for setup.py are not reusable by plugins as well. Also added a factory method for plugin setup parameters.
 2015-05-12 17:20:31 +02:00
Dan Lipsitt
5a1b618ce0 Allow flask 0.10 in setup.py. 2015-04-23 13:17:39 -07:00
Gina Häußge
a824d00f85 Fix: Teeny tiny typo ("out" => "our") 2015-04-16 15:28:17 +02:00
Gina Häußge
e8c085b89c Removed dependency on monotime (accidental leftover) 2015-04-13 18:22:26 +02:00
Gina Häußge
1f559049c6 Merge branch 'devel' into dev/tornadoTimeFunc 2015-03-12 19:20:17 +01:00
Gina Häußge
699f7b5278 More work on custom controls 
Added a lot of documentation, more stream lining, should now work completely without having to define types but offer the same/more functionality than before. Backwards compatible too.
 2015-03-12 17:23:55 +01:00
Gina Häußge
db382e39a7 setup.py: Always include develop dependencies on RTD 2015-03-02 15:17:53 +01:00
Gina Häußge
778a38a668 Added [develop] extra to setup.py to install development dependencies 
Use

    pip install -e .[develop]

 to prime your environment for development, this will install all requirements both for running as well as for development tasks (such as running unit tests or compiling the documentation) and register OctoPrint as an editable python package as well.
 2015-03-02 13:15:00 +01:00
Gina Häußge
ec7feb1a3c Possible workaround for OctoPrint stalling when a clock change happens while it is running 2015-02-05 11:12:03 +01:00
Gina Häußge
039285ffae Fixed babel_refresh command as suggested in #726 
Thanks to @derpicknicker1 for report and suggested fix.

 Closes #726
 2015-01-18 13:57:17 +01:00
Gina Häußge
f52afb8660 Fixed translation feels not being properly copied over during installation 
Should solve initial problem reported in #720
 2015-01-15 16:28:22 +01:00
Gina Häußge
eb2561175d Merge branch 'master' into devel 
Conflicts:
	setup.py
	src/octoprint/timelapse.py
 2014-12-28 00:18:49 +01:00
Gina Häußge
51341f6722 Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command 
(cherry picked from commit 9e014eb)
 2014-12-28 00:00:57 +01:00
Gina Häußge
9e014eba1f Added removal of pyc files (and their parent folders if they are empty after that) to the python setup.py clean command 2014-11-04 10:40:15 +01:00
Gina Häußge
1bdc167f7a Also install plugins from setup.py and don't log notify as info level 2014-09-07 17:28:50 +02:00