Skip to content

Commit

Permalink
Merge branch 'develop' into 1.1.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	pyproject.toml
#	src/facet/__init__.py
  • Loading branch information
j-ittner committed Mar 22, 2021
2 parents a9dbe93 + dff8c8d commit c1509a7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Repository = "https://github.com/BCG-Gamma/facet"

[build.matrix.min]
# direct requirements of gamma-facet
gamma-pytools = "=1.1.*"
gamma-pytools = "=1.1.0rc0"
matplotlib = "=3.0.*"
numpy = "=1.16.*"
packaging = "=20.*"
Expand Down

0 comments on commit c1509a7

Please sign in to comment.