Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop Python 3.7 support and update tests #1316

Merged
merged 16 commits into from
Oct 25, 2024
Merged

Drop Python 3.7 support and update tests #1316

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
9ce9669
Drop Python 3.7 support and update tests
Darkbeast-glitch Oct 10, 2024
4ecc8ed
Merge branch 'master' into drop-python3.7-support
DhanshreeA Oct 12, 2024
e0608f9
Update Python versions in workflows and pyproject.toml and changed sp…
Darkbeast-glitch Oct 13, 2024
83588ef
Merge branch 'drop-python3.7-support' of https://github.com/Darkbeast…
Darkbeast-glitch Oct 13, 2024
b3b2772
Merge branch 'master' into drop-python3.7-support
DhanshreeA Oct 14, 2024
772b6f4
Update Docker images to support Python 3.8 in CircleCI config.yml
Darkbeast-glitch Oct 14, 2024
50c986b
Merge branch 'drop-python3.7-support' of https://github.com/Darkbeast…
Darkbeast-glitch Oct 14, 2024
39173cd
Merge branch 'master' into drop-python3.7-support
DhanshreeA Oct 14, 2024
dac8624
Merge branch 'master' into drop-python3.7-support
Darkbeast-glitch Oct 16, 2024
27a2400
Merge branch 'master' into drop-python3.7-support
DhanshreeA Oct 17, 2024
4635262
Update config.yml
DhanshreeA Oct 17, 2024
5b4d37e
Fix setuptools version in pyproject.toml
Darkbeast-glitch Oct 18, 2024
571a83e
Merge branch 'drop-python3.7-support' of https://github.com/Darkbeast…
Darkbeast-glitch Oct 18, 2024
0ab3755
Merge branch 'master' into drop-python3.7-support
Darkbeast-glitch Oct 18, 2024
632d239
Merge branch 'master' into drop-python3.7-support
Darkbeast-glitch Oct 24, 2024
5e60dfe
Update environment.py
DhanshreeA Oct 25, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/tests_and_cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
install-ersilia:
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
runs-on: ubuntu-22.04
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
Expand All @@ -32,8 +32,8 @@ jobs:
test-docker:
strategy:
matrix:
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
runs-on: ubuntu-22.04
python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
- name: Set up Python ${{ matrix.python-version }}
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Added by Ersilia

# Environment variables
.env
*.pyc
*.vscode
*.code-workspace
Expand Down
10 changes: 6 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ repository = "https://github.com/ersilia-os/ersilia"
documentation = "https://ersilia.io/model-hub"
keywords= ["drug-discovery", "machine-learning", "ersilia", "open-science", "global-health", "model-hub", "infectious-diseases"]
classifiers=[
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about added support for python 3.11 here since you've already added it in your code above

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so you mean I should add python version 3.11 right?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While you are at it, please mention 3.12 as well, thank you!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure please on it

"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: OS Independent",
"Topic :: Scientific/Engineering :: Artificial Intelligence",
Expand All @@ -27,11 +28,10 @@ include = [
]

[tool.poetry.dependencies]
python = ">=3.7"
python = ">=3.8"
inputimeout = "^1.0.4"
emoji = "^2.8.0"
validators = [
{version="0.20.0", python="3.7.*"},
{version="~0.21.0", python=">=3.8"},
]

Expand All @@ -46,17 +46,19 @@ docker = "^6.1.3"
boto3 = "^1.28.40"
requests = "<=2.31.0"
numpy = "<=1.26.4"
setuptools = "^65.0.0" # added to fix the issue with setuptools
isaura = {version="0.1", optional=true}
aiofiles = "<=24.1.0"
aiohttp = "<=3.10.9"
pytest = {version = "^7.4.0", optional = true}
pytest-asyncio = {version = "<=0.24.0", optional = true}
pytest-benchmark = {version = "<=4.0.0", optional = true}
fuzzywuzzy = {version = "^0.18.0", optional = true}
sphinx = {version = ">=5.3.0", optional = true} # For compatibility with python 3.7.x
sphinx = {version = ">=6.0.0", optional = true} # for minimum version and support for Python 3.10
jinja2 = {version = "^3.1.2", optional = true}
scipy = {version = "<=1.10.0", optional = true}


[tool.poetry.extras]
# Instead of using poetry dependency groups, we use extras to make it pip installable
lake = ["isaura"]
Expand Down
Loading