Skip to content

Commit

Permalink
Merge pull request #81 from quant-aq/dhhagan-patch-deps
Browse files Browse the repository at this point in the history
Widened dependencies to solve install issues
  • Loading branch information
dhhagan authored May 8, 2024
2 parents a2d29a4 + 5bbc68a commit 84054cd
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 25 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/test-and-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@ jobs:
- name: Install poetry
uses: snok/install-poetry@v1
with:
version: 1.3.2
virtualenvs-create: true

- name: Install dependencies
run: poetry install --no-interaction
run: |
poetry run pip install --upgrade pip
poetry run pip install --upgrade setuptools
poetry run pip list
poetry install --no-interaction
- name: Run tests and generate coverage report
run: |
Expand Down
23 changes: 6 additions & 17 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "py-smps"
version = "2.1.0a5"
version = "2.1.0a6"
description = "A simple python library to import and visualize data from particle sizing instruments"
authors = ["David H Hagan <[email protected]>"]
license = "MIT"
Expand All @@ -19,10 +19,10 @@ scipy = ">1.7"
setuptools = ">48.0"
joblib = "^1.3"
seaborn = ">=0.12"
matplotlib = ">=3.4,<3.6.1 || >3.6.1"
numpy = ">1.20,<1.24.0 || >1.24.0"
statsmodels = ">=0.12.0"
lock = "^2018.3.25.2110"
matplotlib = ">=3.4,!=3.6.1"
numpy = ">1.20,!=1.24.0"
statsmodels = ">=0.13.0"
requests = ">=2.0"

[tool.poetry.group.dev.dependencies]
pytest = "^6.0"
Expand All @@ -40,8 +40,8 @@ sphinx-gallery = "^0.13.0"
ipykernel = "^6.24.0"

[build-system]
requires = ["poetry>=0.12"]
build-backend = "poetry.masonry.api"
requires = ["poetry-core>=1.0.0"]
build-backend = "poetry.core.masonry.api"

[tool.poetry.urls]
"Bug Tracker" = "https://github.com/quant-aq/py-smps/issues"

0 comments on commit 84054cd

Please sign in to comment.