Skip to content

Commit

Permalink
Merge pull request #129 from nordic-institute/OPMONDEV-187-update-deps
Browse files Browse the repository at this point in the history
chore: Update dependencies to latest versions compatible with python 3.8

Refs: OPMONDEV-187
  • Loading branch information
melbeltagy authored Sep 30, 2024
2 parents 5f1eb85 + 9e6bcef commit 57ec292
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: X-Road Metrics Tests
on: [pull_request]
on: [workflow_dispatch, pull_request]
jobs:
Test-Anonymizer:
name: Anonymizer Tests
Expand Down
9 changes: 6 additions & 3 deletions analysis_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,13 @@

from setuptools import setup, find_packages

# The following dependencies has newer versions, but require Python 3.9 or higher
# pandas, numpy, scipy

requirements = [
'dill==0.3.8',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'dill==0.3.9',
'pymongo==4.9.1',
'pyyaml==6.0.2',
'numpy==1.24.4',
'pandas==2.0.3',
'scipy==1.10.1',
Expand Down
9 changes: 6 additions & 3 deletions analysis_ui_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,14 @@

from setuptools import setup, find_packages

# The following dependencies has newer versions, but require Python 3.9 or higher
# numpy

requirements = [
'dill==0.3.8',
'dill==0.3.9',
'django==2.2.28',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'pymongo==4.9.1',
'pyyaml==6.0.2',
'numpy==1.24.4'
]

Expand Down
6 changes: 3 additions & 3 deletions anonymizer_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
from setuptools import setup, find_packages

requirements = [
'setuptools==67.4.0',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'setuptools==75.1.0',
'pymongo==4.9.1',
'pyyaml==6.0.2',
'psycopg2==2.9.9',
'python-dateutil==2.9.0.post0',
]
Expand Down
10 changes: 5 additions & 5 deletions collector_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
from setuptools import setup

requirements = [
'setuptools==67.4.0',
'pymongo==4.6.3',
'setuptools==75.1.0',
'pymongo==4.9.1',
'requests==2.32.3',
'tqdm==4.66.4',
'pyyaml==6.0.1',
'urllib3==1.26.18',
'tqdm==4.66.5',
'pyyaml==6.0.2',
'urllib3==2.2.3',
]

classifiers = [
Expand Down
4 changes: 3 additions & 1 deletion corrector_module/opmon_corrector/database_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import pymongo
from typing import List, Optional

from pymongo.database import Database

from .logger_manager import LoggerManager
from . import __version__

Expand Down Expand Up @@ -80,7 +82,7 @@ def get_mongo_uri(settings: dict) -> str:
host = settings['mongodb']['host']
return f'mongodb://{user}:{password}@{host}/auth_db'

def get_query_db(self) -> pymongo.database.Database:
def get_query_db(self) -> Database:
"""
Gets the specific (XRoadInstance) query database .
:return: Returns the specific query database.
Expand Down
6 changes: 3 additions & 3 deletions corrector_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
from setuptools import setup

requirements = [
'setuptools==67.4.0',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'setuptools==75.1.0',
'pymongo==4.9.1',
'pyyaml==6.0.2',
]

classifiers = [
Expand Down
10 changes: 5 additions & 5 deletions opendata_collector_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
from setuptools import setup

requirements = [
'setuptools==67.4.0',
'pymongo==4.6.3',
'setuptools==75.1.0',
'pymongo==4.9.1',
'requests==2.32.3',
'tqdm==4.66.4',
'pyyaml==6.0.1',
'urllib3==1.26.18',
'tqdm==4.66.5',
'pyyaml==6.0.2',
'urllib3==2.2.3',
]

classifiers = [
Expand Down
8 changes: 4 additions & 4 deletions opendata_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
from setuptools import setup, find_packages

requirements = [
'setuptools==67.4.0',
'dill==0.3.8',
'setuptools==75.1.0',
'dill==0.3.9',
'django==3.2.20',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'pymongo==4.9.1',
'pyyaml==6.0.2',
'psycopg2==2.9.9',
'python-dateutil==2.9.0.post0',
]
Expand Down
14 changes: 9 additions & 5 deletions reports_module/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,23 @@

from setuptools import setup, find_packages

# The following dependencies has newer versions, but require Python 3.9 or higher
# matplotlib, pandas, weasyprint, numpy, contourpy

requirements = [
'markupsafe==2.1.5',
'Jinja2==3.1.4',
'matplotlib==3.5.3',
'matplotlib==3.7.5',
'pandas==2.0.3',
'weasyprint==61.2',
'Pillow==10.3.0',
'pymongo==4.6.3',
'pyyaml==6.0.1',
'Pillow==10.4.0',
'pymongo==4.9.1',
'pyyaml==6.0.2',
'requests==2.32.3',
'tinycss==0.4',
'jsonschema==4.22.0',
'jsonschema==4.23.0',
'numpy==1.24.4',
'contourpy==1.1.1',
]

classifiers = [
Expand Down

0 comments on commit 57ec292

Please sign in to comment.