From 4d0b6959d247450d596f0cf805cda6ade76e271e Mon Sep 17 00:00:00 2001 From: zyteka Date: Thu, 22 Feb 2024 11:14:24 -0500 Subject: [PATCH 1/2] Fixing dependencies for pip --- poetry.lock | 5 +++-- pyproject.toml | 15 ++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/poetry.lock b/poetry.lock index 678a686..c6072ec 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.0 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand. [[package]] name = "alabaster" @@ -2099,6 +2099,7 @@ files = [ {file = "lxml-4.9.4-cp312-cp312-manylinux_2_28_x86_64.whl", hash = "sha256:e8f9f93a23634cfafbad6e46ad7d09e0f4a25a2400e4a64b1b7b7c0fbaa06d9d"}, {file = "lxml-4.9.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:3f3f00a9061605725df1816f5713d10cd94636347ed651abdbc75828df302b20"}, {file = "lxml-4.9.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:953dd5481bd6252bd480d6ec431f61d7d87fdcbbb71b0d2bdcfc6ae00bb6fb10"}, + {file = "lxml-4.9.4-cp312-cp312-win32.whl", hash = "sha256:266f655d1baff9c47b52f529b5f6bec33f66042f65f7c56adde3fcf2ed62ae8b"}, {file = "lxml-4.9.4-cp312-cp312-win_amd64.whl", hash = "sha256:f1faee2a831fe249e1bae9cbc68d3cd8a30f7e37851deee4d7962b17c410dd56"}, {file = "lxml-4.9.4-cp35-cp35m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:23d891e5bdc12e2e506e7d225d6aa929e0a0368c9916c1fddefab88166e98b20"}, {file = "lxml-4.9.4-cp35-cp35m-manylinux_2_5_x86_64.manylinux1_x86_64.whl", hash = "sha256:e96a1788f24d03e8d61679f9881a883ecdf9c445a38f9ae3f3f193ab6c591c66"}, @@ -4833,4 +4834,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<3.9.7 || >3.9.7,<3.12" -content-hash = "87085173c0f4b8dd9b46e74b3c583bc53c3f5b0308f4cc24c90e13a45b58bf8c" +content-hash = "13270c3c4d0faa1b2a8e3d2e00182ba4a1bc32806f2592291324b76c0b076991" diff --git a/pyproject.toml b/pyproject.toml index cadfe0d..ef7604e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,29 +32,26 @@ python = ">=3.9,<3.9.7 || >3.9.7,<3.12" click = "^8.1.3" pyyaml = "^6.0" pyreal = "^0.4.7" -black = {extras = ["jupyter"], version = "^23.7.0"} greenlet = "^2.0.2" gevent = "^23.9.0.post1" tqdm = "^4.66.1" streamlit = {version = "^1.29.0", optional = true} - -[tool.poetry.group.general.dependencies] passlib = "^1.7.4" termcolor = "^2.0.1" -xgboost = "0.90" - -[tool.poetry.group.math.dependencies] numpy = "^1.23.3" pandas = "^1.5.0" -[tool.poetry.group.web-server.dependencies] +# ML Dependencies +xgboost = "0.90" + +# Web server dependencies Flask = "2.2.2" Flask-Cors = "3.0.10" Flask-RESTful = "0.3.9" Werkzeug = "2.2.2" flasgger = "0.9.5" -[tool.poetry.group.database.dependencies] +# Database dependencies mongoengine = "^0.24.2" pymongo = "^4.2.0" @@ -73,7 +70,7 @@ Sphinx = ">=5.2.3" # Style Dependencies flake8 = "^5.0.4" isort = "^5.11.4" -black = "^23.1.0" +black = {extras = ["jupyter"], version = "^23.7.0"} [tool.poetry.group.setup] optional = true From 8b7c76d5ffa6b0de7e243cf71842b0945bad19f0 Mon Sep 17 00:00:00 2001 From: zyteka Date: Thu, 22 Feb 2024 11:48:49 -0500 Subject: [PATCH 2/2] Removing windows mongodb testing --- .github/workflows/python-test.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml index ad1879e..5f40c47 100644 --- a/.github/workflows/python-test.yml +++ b/.github/workflows/python-test.yml @@ -8,14 +8,9 @@ jobs: strategy: fail-fast: true matrix: - os: ["ubuntu-latest", "windows-latest"] + os: ["ubuntu-latest"] python-version: ["3.8", "3.9", "3.10"] - mongodb-version: ['5.0', '6.0'] - exclude: - - os: "ubuntu-latest" - mongodb-version: "5.0" - - os: "windows-latest" - mongodb-version: "6.0" + mongodb-version: ['6.0', '7.0'] runs-on: ${{ matrix.os }} timeout-minutes: 25