Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
malnvenshorn committed Dec 12, 2017
2 parents cf471c7 + b868a5c commit dcfb8b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ If you have questions or encounter issues please take a look at the [Frequently

1. Install dependencies with:

`pacman -Sy python2-psycopg2` on Arch Linux

`apt-get install python-psycopg2` on Debian/Raspbian
`pacman -Sy postgresql-libs` on Arch Linux
`apt-get install libpq-dev` on Debian/Raspbian

1. Install this plugin via the bundled [Plugin Manager](https://github.com/foosel/OctoPrint/wiki/Plugin:-Plugin-Manager)
or manually using this URL:
Expand Down
9 changes: 3 additions & 6 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,14 @@
plugin_identifier = "filamentmanager"
plugin_package = "octoprint_filamentmanager"
plugin_name = "OctoPrint-FilamentManager"
plugin_version = "0.5.1"
plugin_version = "0.5.0"
plugin_description = "Manage your spools and keep track of remaining filament on them"
plugin_author = "Sven Lohrmann"
plugin_author_email = "[email protected]"
plugin_url = "https://github.com/malnvenshorn/OctoPrint-FilamentManager"
plugin_license = "AGPLv3"
plugin_requires = [
"backports.csv>=1.0.5,<1.1",
"SQLAlchemy>=1.1.15,<1.2",
"uritools>=2.1,<2.2"
]
plugin_requires = ["backports.csv>=1.0.5,<1.1", "SQLAlchemy>=1.1.15,<1.2",
"psycopg2>=2.7.3,<2.8", "uritools>=2.1,<2.2"]
plugin_additional_data = []
plugin_additional_packages = []
plugin_ignored_packages = []
Expand Down

0 comments on commit dcfb8b0

Please sign in to comment.