Skip to content
Merged
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
10 changes: 10 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,16 @@ Changelog
Unreleased
----------

Fixed
-----
- upload-release command to release archive requires the `user_id` of the session.
- Linting, equivalence, and docstring issues.

Updated
-------
- Updated pillow version <=8,<9


Added
~~~~~
- Python 3.9 support
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def run_tests(self):
# Version 1.21 upwards only support Python >= 3.7
"numpy>=1.14,<=1.20.3",
"pandas>=1,<2",
"pillow>=3,<4",
"pillow>=8,<9",
"plotly>=1.13,<2",
]

Expand Down
4 changes: 2 additions & 2 deletions transcriptic/analysis/spectrophotometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def plot(self, mpl=True, plot_type="box", **plt_kwargs):
is rendered
plot_type : {"box", "bar", "line", "hist"}, optional
Type of plot to render
\**plot_kwargs : dict, optional
plot_kwargs : dict, optional
Optional dictionary of specifications for your plot type of choice
"""
py.offline.init_notebook_mode()
Expand Down Expand Up @@ -215,7 +215,7 @@ def beers_law(self, conc_list=None, use_adj=True, **kwargs):
use_adj: Boolean, optional
Boolean option which determines if the adjusted absorbance readings
are used
\**plot_kwargs : dict
kwargs : dict
Optional dictionary of specifications for your plot type of choice
"""
if "title" not in kwargs:
Expand Down
4 changes: 3 additions & 1 deletion transcriptic/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,9 @@ def upload_release(api, archive, package):
bar.update(20)
try:
up = api.post_release(
data=json.dumps({"release": {"upload_id": upload_id}}),
data=json.dumps(
{"release": {"upload_id": upload_id, "user_id": api.user_id}}
),
package_id=package_id,
)
re = up["id"]
Expand Down
10 changes: 5 additions & 5 deletions transcriptic/english.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ def job_tree(self):
def depth_one(steps):
depth_one = []
for step in steps:
if type(step) is list:
if type(step[0]) is list:
if isinstance(step, list):
if isinstance(step[0], list):
depth_one.append(step[0])
else:
depth_one.append(step)
Expand Down Expand Up @@ -390,7 +390,7 @@ def dict_to_list(forest):
def print_tree(lst, level=0):
print(" " * (level - 1) + "+---" * (level > 0) + str(lst[0]))
for l in lst[1:]:
if type(l) is list:
if isinstance(l, list):
print_tree(l, level + 1)
else:
print(" " * level + "+---" + l)
Expand Down Expand Up @@ -436,12 +436,12 @@ def autopick(self, opts):
% (
len(g["to"]),
len(g["from"]),
("well" if len(g["from"]) is 1 else "wells"),
("well" if len(g["from"]) == 1 else "wells"),
self.well_list(g["from"]),
self.well_list(g["to"]),
(
f"data saved at '{opts['dataref']}'"
if i is 0
if i == 0
else "analyzed with previous"
),
)
Expand Down
2 changes: 1 addition & 1 deletion transcriptic/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def regex_manifest(protocol, input):
"""Special input types, gets updated as more input types are added"""
if "type" in input and input["type"] == "choice":
if "options" in input:
pattern = "\[(.*?)\]"
pattern = r"\[(.*?)\]"
match = re.search(pattern, str(input["options"]))
if not match:
click.echo(
Expand Down