From 91496d91e1796a141e125e6317f75c5c0a6fb902 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merc=C3=A8=20Mart=C3=ADn=20Prats?= Date: Thu, 7 Sep 2023 11:51:06 +0200 Subject: [PATCH 1/4] Upgrading libraries to avoid failures in Apple M1 machines --- HISTORY.rst | 5 +++++ bigml/version.py | 2 +- setup.py | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index f0b4342f..1cab890b 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,6 +3,11 @@ History ------- +9.7.0 (2023-09-07) +------------------ + +- Upgrading libraries to avoid failures in Apple M1 machines. + 9.6.2 (2023-08-02) ------------------ diff --git a/bigml/version.py b/bigml/version.py index 075aac01..3879beb2 100644 --- a/bigml/version.py +++ b/bigml/version.py @@ -1 +1 @@ -__version__ = '9.6.2' +__version__ = '9.7.0' diff --git a/setup.py b/setup.py index 1414577f..f8595308 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ open(version_py_path).read()).group(1) TOPIC_MODELING_DEPENDENCIES = ["cython", "pystemmer==2.0.1"] -IMAGES_DEPENDENCIES = ["bigml-sensenet==0.7.0"] +IMAGES_DEPENDENCIES = ["bigml-sensenet==0.7.1"] # Concatenate files into the long description file_contents = [] @@ -51,7 +51,7 @@ license="http://www.apache.org/licenses/LICENSE-2.0", setup_requires = ['pytest'], install_requires = ["unidecode", "bigml-chronos>=0.4.3", "requests", - "requests-toolbelt", "msgpack", "numpy>=1.22,<1.24", "scipy", + "requests-toolbelt", "msgpack", "numpy>=1.24,<1.25", "scipy", "javascript"], extras_require={"images": IMAGES_DEPENDENCIES, "topics": TOPIC_MODELING_DEPENDENCIES, From d53b6a12452a75b2ca64b6cc8e2da198137b154f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merc=C3=A8=20Mart=C3=ADn=20Prats?= Date: Thu, 5 Oct 2023 17:23:36 +0200 Subject: [PATCH 2/4] Fixing local predictions input data preprocessing for missings --- HISTORY.rst | 1 + bigml/modelfields.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/HISTORY.rst b/HISTORY.rst index 1cab890b..653981e1 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -7,6 +7,7 @@ History ------------------ - Upgrading libraries to avoid failures in Apple M1 machines. +- Fixing local predictions input data preprocessing for missings. 9.6.2 (2023-08-02) ------------------ diff --git a/bigml/modelfields.py b/bigml/modelfields.py index 946e6078..2eb9b38a 100644 --- a/bigml/modelfields.py +++ b/bigml/modelfields.py @@ -290,7 +290,8 @@ def normalize(self, value): """ if isinstance(value, str) and not isinstance(value, str): value = str(value, "utf-8") - return None if value in self.missing_tokens else value + return None if hasattr(self, "missing_tokens") and \ + value in self.missing_tokens else value def fill_numeric_defaults(self, input_data): """Fills the value set as default for numeric missing fields if user From 768f6dd47fb6db7ce259c2f2e0b9e51c8f954804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merc=C3=A8=20Mart=C3=ADn=20Prats?= Date: Tue, 5 Dec 2023 19:02:33 +0100 Subject: [PATCH 3/4] Updating sensenet version --- bigml/deepnet.py | 2 +- setup.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bigml/deepnet.py b/bigml/deepnet.py index 1a698219..5756933e 100644 --- a/bigml/deepnet.py +++ b/bigml/deepnet.py @@ -46,7 +46,7 @@ from functools import cmp_to_key # avoiding tensorflow info logging -os.environ['TF_CPP_MIN_LOG_LEVEL'] = '2' +os.environ['TF_CPP_MIN_LOG_LEVEL'] = '3' logging.getLogger('tensorflow').setLevel(logging.ERROR) from bigml.api import FINISHED diff --git a/setup.py b/setup.py index f8595308..bd7df954 100644 --- a/setup.py +++ b/setup.py @@ -29,8 +29,8 @@ version = re.search("__version__ = '([^']+)'", open(version_py_path).read()).group(1) -TOPIC_MODELING_DEPENDENCIES = ["cython", "pystemmer==2.0.1"] -IMAGES_DEPENDENCIES = ["bigml-sensenet==0.7.1"] +TOPIC_MODELING_DEPENDENCIES = ["cython", "pystemmer==2.2.0.1"] +IMAGES_DEPENDENCIES = ["bigml-sensenet==0.7.2"] # Concatenate files into the long description file_contents = [] @@ -51,7 +51,7 @@ license="http://www.apache.org/licenses/LICENSE-2.0", setup_requires = ['pytest'], install_requires = ["unidecode", "bigml-chronos>=0.4.3", "requests", - "requests-toolbelt", "msgpack", "numpy>=1.24,<1.25", "scipy", + "requests-toolbelt", "msgpack", "numpy>=1.25,<1.26", "scipy", "javascript"], extras_require={"images": IMAGES_DEPENDENCIES, "topics": TOPIC_MODELING_DEPENDENCIES, From 86219aae7d304f431b2aecf9dc884818233e05d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Merc=C3=A8=20Mart=C3=ADn=20Prats?= Date: Mon, 19 Feb 2024 17:37:45 +0100 Subject: [PATCH 4/4] Development version upgrading underlying libraries --- .github/workflows/tests_01.yml | 2 +- .github/workflows/tests_05.yml | 2 +- .github/workflows/tests_22.yml | 2 +- .github/workflows/tests_23.yml | 2 +- .github/workflows/tests_36.yml | 2 +- HISTORY.rst | 4 ++-- bigml/version.py | 2 +- setup.py | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests_01.yml b/.github/workflows/tests_01.yml index c2471c71..a6709e17 100644 --- a/.github/workflows/tests_01.yml +++ b/.github/workflows/tests_01.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.10] + python: [3.11] env: BIGML_USERNAME: ${{ secrets.BIGML_USERNAME }} BIGML_API_KEY: ${{ secrets.BIGML_API_KEY }} diff --git a/.github/workflows/tests_05.yml b/.github/workflows/tests_05.yml index 0c943129..dc01250a 100644 --- a/.github/workflows/tests_05.yml +++ b/.github/workflows/tests_05.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.10] + python: [3.11] env: BIGML_USERNAME: ${{ secrets.BIGML_USERNAME }} BIGML_API_KEY: ${{ secrets.BIGML_API_KEY }} diff --git a/.github/workflows/tests_22.yml b/.github/workflows/tests_22.yml index a80d8668..7d2d8c87 100644 --- a/.github/workflows/tests_22.yml +++ b/.github/workflows/tests_22.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.10] + python: [3.11] env: BIGML_USERNAME: ${{ secrets.BIGML_USERNAME }} BIGML_API_KEY: ${{ secrets.BIGML_API_KEY }} diff --git a/.github/workflows/tests_23.yml b/.github/workflows/tests_23.yml index 2edc1e6b..859be798 100644 --- a/.github/workflows/tests_23.yml +++ b/.github/workflows/tests_23.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.10] + python: [3.11] env: BIGML_USERNAME: ${{ secrets.BIGML_USERNAME }} BIGML_API_KEY: ${{ secrets.BIGML_API_KEY }} diff --git a/.github/workflows/tests_36.yml b/.github/workflows/tests_36.yml index e6cfe5cd..934cfc83 100644 --- a/.github/workflows/tests_36.yml +++ b/.github/workflows/tests_36.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python: [3.10] + python: [3.11] env: BIGML_USERNAME: ${{ secrets.BIGML_USERNAME }} BIGML_API_KEY: ${{ secrets.BIGML_API_KEY }} diff --git a/HISTORY.rst b/HISTORY.rst index da5c09d1..1a63a61c 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -3,8 +3,8 @@ History ------- -9.8.0 (2024-01-09) ------------------- +9.8.0.dev (2024-02-19) +---------------------- - Upgrading libraries to avoid failures in Apple M1 machines. - Fixing local predictions input data preprocessing for missings. diff --git a/bigml/version.py b/bigml/version.py index 3cd81c28..4e9967f4 100644 --- a/bigml/version.py +++ b/bigml/version.py @@ -1 +1 @@ -__version__ = '9.8.0' +__version__ = '9.8.0.dev' diff --git a/setup.py b/setup.py index bd7df954..824fdea2 100644 --- a/setup.py +++ b/setup.py @@ -51,7 +51,7 @@ license="http://www.apache.org/licenses/LICENSE-2.0", setup_requires = ['pytest'], install_requires = ["unidecode", "bigml-chronos>=0.4.3", "requests", - "requests-toolbelt", "msgpack", "numpy>=1.25,<1.26", "scipy", + "requests-toolbelt", "msgpack", "numpy>=1.22", "scipy", "javascript"], extras_require={"images": IMAGES_DEPENDENCIES, "topics": TOPIC_MODELING_DEPENDENCIES,