Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pin: SQLAlchemy>=1.4,<1.5 #123

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions octoprint_filamentmanager/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def get_all_spools(self):
j = self.spools.join(self.profiles, self.spools.c.profile_id == self.profiles.c.id)
stmt = select([self.spools, self.profiles]).select_from(j).order_by(self.spools.c.name)
result = self.conn.execute(stmt)
return [self._build_spool_dict(row, row.keys()) for row in result.fetchall()]
return [self._build_spool_dict(row, tuple(k for k in row.keys())) for row in result.fetchall()]

def get_spools_lastmodified(self):
with self.lock, self.conn.begin():
Expand All @@ -247,7 +247,7 @@ def get_spool(self, identifier):
.where(self.spools.c.id == identifier).order_by(self.spools.c.name)
result = self.conn.execute(stmt)
row = result.fetchone()
return self._build_spool_dict(row, row.keys()) if row is not None else None
return self._build_spool_dict(row, tuple(k for k in row.keys())) if row is not None else None

def create_spool(self, data):
with self.lock, self.conn.begin():
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
plugin_url = "https://github.com/OllisGit/OctoPrint-FilamentManager"
plugin_license = "AGPLv3"
plugin_requires = ["backports.csv>=1.0.5,<1.1",
"octoprint>=1.8.6",
"uritools>=2.1,<2.2",
"SQLAlchemy>=1.1.15,<1.2"]
"SQLAlchemy>=1.4,<1.5"]
plugin_additional_data = []
plugin_additional_packages = []
plugin_ignored_packages = []
Expand All @@ -29,6 +30,7 @@
"the same python installation that OctoPrint is installed under?")
import sys
sys.exit(-1)


setup_parameters = octoprint_setuptools.create_plugin_setup_parameters(
identifier=plugin_identifier,
Expand Down