Commit graph

53 commits

Author SHA1 Message Date
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
Gina Häußge
e51d9439c5 Modified versioneer to allow specification of manual versions based on branches
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
(cherry picked from commit 212f40c)
2014-09-03 10:53:54 +02:00
Gina Häußge
212f40cd1a Modified versioneer to allow specification of manual versions based on branches
You can now define a lookup file explicitely mapping virtual version tags to branches via regular expressions and a reference commit from which the commit distance will be calculated.

Format of the file is

  <branch-regex> <tag> <reference commit>

The file is processed from top to bottom, the first matching line wins. If <tag> or <reference commit> are left out, the lookup table does not apply to the matched branches and the regular versioneer resolution (via git describe) takes place.

Current configuration makes "master", "staging" and any branch starting with "fix/" make use the default behaviour, all other branches (so basically all development branches) are defined as "1.2.0-dev"
2014-09-02 11:35:42 +02:00
Gina Häußge
8c34a4fd0a Improved support of translation related things in setup.py
Allow specifying a locale for refreshing only that translation from
extracted messages, new command for just extracting messages.
2014-08-31 21:59:40 +02:00
Gina Häußge
35b1232b0a Fixed hen-egg problem in setup.py
setup.py tried to use babel imports before the necessary requirements
were fetched. Now only tries to import that stuff if
babel_{refresh|compile|new} is called instead of importing it
in the file header.
2014-08-28 15:59:57 +02:00
Gina Häußge
a9736b96c0 po2json is only needed in development environments, so don't try to always import it 2014-08-27 15:13:19 +02:00
Gina Häußge
53e52c841b First version of OctoPrint with i18n/l10n support
Also included is a translation for (informal) german.

New languages can be added with "python setup.py babel_new --locale=<language code>" which will create the corresponding .po file from the existing .pot file under "src/octoprint/translations/<language code>". Translations can be refreshed from strings in source with "python setup.py babel_refresh". Existing translations can be compiled into usable translation files (.mo for python and .js for Javascript) via "python setup.py babel_compile".

 You'll need to install the development dependencies for all of this to work, just issue "pip install -r requirements-dev.txt"

 Note: numbers are not yet correctly formatted for their respective locale (e.g. "2.5mm" instead of "2,5mm" in german).
2014-08-27 14:46:46 +02:00
Gina Häußge
ee36c31637 Added clean command to setup.py
(cherry picked from commit 76a9e94)
2014-08-08 17:03:29 +02:00
Gina Häußge
76a9e94aed Added clean command to setup.py 2014-06-23 13:09:54 +02:00
Gina Häußge
772ebd198a Fixed setup.py to correctly work with versioneer
(cherry picked from commit de7808d)
2014-06-23 10:36:30 +02:00
Gina Häußge
de7808d42b Fixed setup.py to correctly work with versioneer 2014-06-23 10:35:59 +02:00
Gina Häußge
55b24c6a45 Removed left overs from old VERSION tracking
(cherry picked from commit 603f667)
2014-06-22 01:15:53 +02:00
Gina Häußge
603f667f93 Removed left overs from old VERSION tracking 2014-06-22 01:15:31 +02:00
Gina Häußge
18162cf110 Versioning by versioneer: https://github.com/warner/python-versioneer/
(cherry picked from commit 285f464)
2014-06-22 01:12:06 +02:00
Gina Häußge
285f464b43 Versioning by versioneer: https://github.com/warner/python-versioneer/ 2014-06-22 00:41:03 +02:00
Gina Häußge
ac75ee9831 Starting documentation based on Sphinx 2013-12-02 17:40:31 +01:00
Gina Häußge
51ae782f02 Moved octoprint sources to "src" folder, adjusted setup.py and run script accordingly 2013-09-15 21:45:33 +02:00
Gina Häußge
31698d3543 First version of setup.py for packaging OctoPrint 2013-07-09 21:39:07 +02:00
Gina Häußge
a0cac835b5 Major reorganization to only include the communication stack from Cura. 2012-12-31 13:18:55 +01:00
Daid
943cd97ab9 Keep the example and firmware data in subdirectories. 2012-12-24 12:27:08 +01:00
daid303
3b37498d2e Updated version number to 12.12, fixed some minor packaging issues. 2012-12-20 09:27:06 +01:00
Ilya Kulakov
8ee80a5e34 Make app an owner of file formats.
Since Cura works with file formats designed for exporting
it makes sense to be an Owner of such files, since Cura
prints them.
2012-12-13 20:37:46 +07:00