diff --git a/.github/workflows/test-and-report.yml b/.github/workflows/test-and-report.yml index 384a6d2..82cf095 100644 --- a/.github/workflows/test-and-report.yml +++ b/.github/workflows/test-and-report.yml @@ -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: | diff --git a/poetry.lock b/poetry.lock index 1d4bd22..3134c30 100644 --- a/poetry.lock +++ b/poetry.lock @@ -149,7 +149,7 @@ css = ["tinycss2 (>=1.1.0,<1.3)"] name = "certifi" version = "2024.2.2" description = "Python package for providing Mozilla's CA Bundle." -category = "dev" +category = "main" optional = false python-versions = ">=3.6" files = [ @@ -226,7 +226,7 @@ pycparser = "*" name = "charset-normalizer" version = "3.3.2" description = "The Real First Universal Charset Detector. Open, modern and actively maintained alternative to Chardet." -category = "dev" +category = "main" optional = false python-versions = ">=3.7.0" files = [ @@ -694,7 +694,7 @@ sphinx-basic-ng = "*" name = "idna" version = "3.7" description = "Internationalized Domain Names in Applications (IDNA)" -category = "dev" +category = "main" optional = false python-versions = ">=3.5" files = [ @@ -1100,17 +1100,6 @@ files = [ {file = "kiwisolver-1.4.5.tar.gz", hash = "sha256:e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec"}, ] -[[package]] -name = "lock" -version = "2018.3.25.2110" -description = "module for enabling file locks" -category = "main" -optional = false -python-versions = "*" -files = [ - {file = "lock-2018.3.25.2110.tar.gz", hash = "sha256:cc5ac770930493eed7a8cfd0cf2568a125faf112eb8aa6b6149b3e581523d0c7"}, -] - [[package]] name = "markdown-it-py" version = "2.2.0" @@ -2241,7 +2230,7 @@ rpds-py = ">=0.7.0" name = "requests" version = "2.31.0" description = "Python HTTP for Humans." -category = "dev" +category = "main" optional = false python-versions = ">=3.7" files = [ @@ -2855,7 +2844,7 @@ files = [ name = "urllib3" version = "2.2.1" description = "HTTP library with thread-safe connection pooling, file post, and more." -category = "dev" +category = "main" optional = false python-versions = ">=3.8" files = [ @@ -2912,4 +2901,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8, <3.12" -content-hash = "311c018d361ccc42480a23b6cbb7a493b715c63919c2eb9cfe759e58afcca58c" +content-hash = "5ddc5f549e85df98bcdaf24275600b3ffaac543d00d1b48c13b810b4fbd95746" diff --git a/pyproject.toml b/pyproject.toml index 58eab89..e79422b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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 "] license = "MIT" @@ -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" @@ -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" \ No newline at end of file