From 6762bb81ae2ca53184b60fb259d28dcbd7571e63 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 13:35:18 +0200 Subject: [PATCH 01/46] GitHub Actions: Test on Python 3.12 beta 1 --- .github/workflows/build.yml | 2 +- .github/workflows/directory_writer.yml | 2 +- .github/workflows/project_euler.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b9cc890b6af..07becc545d01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: 3.12-dev - uses: actions/cache@v3 with: path: ~/.cache/pip diff --git a/.github/workflows/directory_writer.yml b/.github/workflows/directory_writer.yml index 331962cef11e..11374ccc1f56 100644 --- a/.github/workflows/directory_writer.yml +++ b/.github/workflows/directory_writer.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v1 # v1, NOT v2 or v3 - uses: actions/setup-python@v4 with: - python-version: 3.x + python-version: 3.12-dev - name: Write DIRECTORY.md run: | scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md diff --git a/.github/workflows/project_euler.yml b/.github/workflows/project_euler.yml index 460938219c14..738cf30aa9a9 100644 --- a/.github/workflows/project_euler.yml +++ b/.github/workflows/project_euler.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.x + python-version: 3.12-dev - name: Install pytest and pytest-cov run: | python -m pip install --upgrade pip @@ -29,7 +29,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v4 with: - python-version: 3.x + python-version: 3.12-dev - name: Install pytest and requests run: | python -m pip install --upgrade pip From 329ac71d780dd1bb910fd9d690e013eec1416768 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 13:40:13 +0200 Subject: [PATCH 02/46] GitHub Actions: Test on Python 3.12 beta 1 --- .github/workflows/build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07becc545d01..f0602ab61b88 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,6 +17,11 @@ jobs: with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} + - if: "contains(matrix.python-version, '-dev')" + run: | + sudo apt-get update + # https://lxml.de/installation.html#requirements + sudo apt-get install -y libxml2 libxslt-dev - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel From 9c4368bc763c51cbe6ebbe93065ada79fa0fbe61 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 13:46:29 +0200 Subject: [PATCH 03/46] GitHub Actions: Test on Python 3.12 beta 1 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f0602ab61b88..2c52078cb1a1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,8 +17,8 @@ jobs: with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }} - - if: "contains(matrix.python-version, '-dev')" - run: | + # - if: "contains(matrix.python-version, '-dev')" + - run: | sudo apt-get update # https://lxml.de/installation.html#requirements sudo apt-get install -y libxml2 libxslt-dev From 9973e649b4a2af9c872ab60563d45e5d9e804278 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 15:58:34 +0200 Subject: [PATCH 04/46] GitHub Actions: Test on Python 3.12 beta 1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c52078cb1a1..72f00a6bbf3d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: - run: | sudo apt-get update # https://lxml.de/installation.html#requirements - sudo apt-get install -y libxml2 libxslt-dev + sudo apt-get install -y Cython libxml2 libxslt-dev - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel From 4948504cff3d1cacaa8060e90d2438965d8affe5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:03:39 +0200 Subject: [PATCH 05/46] GitHub Actions: Test on Python 3.12 beta 1 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 72f00a6bbf3d..ad2a5a595c4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,10 +21,11 @@ jobs: - run: | sudo apt-get update # https://lxml.de/installation.html#requirements - sudo apt-get install -y Cython libxml2 libxslt-dev + sudo apt-get install -y libxml2 libxslt-dev - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel + python -m pip install Cython python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From db20f8d0ef77d9f40b5023ae2d1509e81e953e87 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:22:47 +0200 Subject: [PATCH 06/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index acfbc823e77f..cfc1e2da14d1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ fake_useragent keras lxml matplotlib -numpy +numpy ; python_version < '3.12' opencv-python pandas pillow From 9ec8f5b0f98f13ea25d63974faefbccb512de294 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:25:01 +0200 Subject: [PATCH 07/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cfc1e2da14d1..4202577f4bea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ beautifulsoup4 fake_useragent keras lxml -matplotlib +matplotlib ; python_version < '3.12' numpy ; python_version < '3.12' opencv-python pandas From 4cf2476855ff93185639607e1da2031ceafd7072 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:30:59 +0200 Subject: [PATCH 08/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4202577f4bea..a230db9b4854 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ lxml matplotlib ; python_version < '3.12' numpy ; python_version < '3.12' opencv-python -pandas +pandas ; python_version < '3.12' pillow projectq qiskit From c7c793eaada8b924b6b8ff8c55795c00d2a7e5e9 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:38:36 +0200 Subject: [PATCH 09/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a230db9b4854..3ecdcffc7dbc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,7 +12,7 @@ qiskit requests rich scikit-fuzzy -scikit-learn +scikit-learn ; python_version < '3.12' statsmodels sympy tensorflow From 1e3770265f949d7cdf0851c1307379013689cbfa Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:40:58 +0200 Subject: [PATCH 10/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3ecdcffc7dbc..91ae47845363 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,7 +13,7 @@ requests rich scikit-fuzzy scikit-learn ; python_version < '3.12' -statsmodels +statsmodels ; python_version < '3.12' sympy tensorflow texttable From 493989794751e28bdfaf1702b844d9b7ca7dc210 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:43:36 +0200 Subject: [PATCH 11/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 91ae47845363..6df48e84a5e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,8 +14,8 @@ rich scikit-fuzzy scikit-learn ; python_version < '3.12' statsmodels ; python_version < '3.12' -sympy -tensorflow +sympy ; python_version < '3.12' +tensorflow ; python_version < '3.12' texttable tweepy xgboost From 05b91e43a2ccf90bbac817b8ae0629798c73ca79 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:47:07 +0200 Subject: [PATCH 12/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6df48e84a5e9..966a4157dfb9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ keras lxml matplotlib ; python_version < '3.12' numpy ; python_version < '3.12' -opencv-python +opencv-python ; python_version < '3.12' pandas ; python_version < '3.12' pillow projectq From 7ee638757223bcd9da0d0f83e919bcc84a5547fc Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 16:49:32 +0200 Subject: [PATCH 13/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 966a4157dfb9..4e00c20044fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ numpy ; python_version < '3.12' opencv-python ; python_version < '3.12' pandas ; python_version < '3.12' pillow -projectq +projectq ; python_version < '3.12' qiskit requests rich From b8cadfc26b3d73aaa4d9fcbd4962c346ee0b5a3d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 17:00:43 +0200 Subject: [PATCH 14/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4e00c20044fb..93552b79603c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ opencv-python ; python_version < '3.12' pandas ; python_version < '3.12' pillow projectq ; python_version < '3.12' -qiskit +qiskit ; python_version < '3.12' requests rich scikit-fuzzy From e08238df7e1681f24cce9566cdf68fd3731d3640 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 27 May 2023 17:07:16 +0200 Subject: [PATCH 15/46] GitHub Actions: Test on Python 3.12 beta 1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 93552b79603c..4da0135fcfc6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ projectq ; python_version < '3.12' qiskit ; python_version < '3.12' requests rich -scikit-fuzzy +scikit-fuzzy ; python_version < '3.12' scikit-learn ; python_version < '3.12' statsmodels ; python_version < '3.12' sympy ; python_version < '3.12' From 849d8b36fbe010a7ae54c9a13b66bc829b59bac5 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 08:10:02 +0200 Subject: [PATCH 16/46] python -m pip install Cython https://github.com/numpy/numpy@main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad2a5a595c4d..0e743ccb2507 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython + python -m pip install Cython https://github.com/numpy/numpy@main python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From 3363f2cf0c1b6d4aa0b7fee47ea8f814ffd1791a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 08:13:26 +0200 Subject: [PATCH 17/46] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e743ccb2507..38c1c250d510 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython https://github.com/numpy/numpy@main + python -m pip install Cython https://github.com/numpy/numpy python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From 7b0bffddee8c18277b5cfdd8c8365b195b8c697a Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 09:21:49 +0200 Subject: [PATCH 18/46] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 38c1c250d510..73fb0cfc112d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython https://github.com/numpy/numpy + python -m pip install Cython https://github.com/numpy/numpy.git python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From 334111126e053c32852b1bb13795586a2073e4fd Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 09:25:44 +0200 Subject: [PATCH 19/46] git+https://github.com/numpy/numpy.git@main --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73fb0cfc112d..49281293c17c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython https://github.com/numpy/numpy.git + python -m pip install Cython git+https://github.com/numpy/numpy.git@main python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From e43de87e99a2848b1b9fbae9649da9011409abc6 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 09:36:11 +0200 Subject: [PATCH 20/46] git+https://github.com/cclauss/numpy.git@patch-1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49281293c17c..8bba6225d714 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython git+https://github.com/numpy/numpy.git@main + python -m pip install Cython git+https://github.com/cclauss/numpy.git@patch-1 python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From f43bc388d350059d78e8f254368222391032be0c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 09:57:45 +0200 Subject: [PATCH 21/46] Update requirements.txt --- requirements.txt | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4da0135fcfc6..24bdf9732c85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,21 +2,22 @@ beautifulsoup4 fake_useragent keras lxml -matplotlib ; python_version < '3.12' -numpy ; python_version < '3.12' -opencv-python ; python_version < '3.12' -pandas ; python_version < '3.12' +matplotlib # ; python_version < '3.12' +# numpy ; python_version < '3.12' +git+https://github.com/cclauss/numpy.git@patch-1 +opencv-python # ; python_version < '3.12' +pandas # ; python_version < '3.12' pillow -projectq ; python_version < '3.12' -qiskit ; python_version < '3.12' +projectq # ; python_version < '3.12' +qiskit # ; python_version < '3.12' requests rich -scikit-fuzzy ; python_version < '3.12' -scikit-learn ; python_version < '3.12' -statsmodels ; python_version < '3.12' -sympy ; python_version < '3.12' +scikit-fuzzy # ; python_version < '3.12' +scikit-learn # ; python_version < '3.12' +statsmodels # ; python_version < '3.12' +sympy # ; python_version < '3.12' tensorflow ; python_version < '3.12' texttable -tweepy -xgboost +tweepy ; python_version < '3.12' +xgboost ; python_version < '3.12' yulewalker From 93edcc1c35d166b1bce8208cb460e52d941b1f66 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 28 May 2023 10:43:03 +0200 Subject: [PATCH 22/46] Update requirements.txt --- requirements.txt | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/requirements.txt b/requirements.txt index 24bdf9732c85..201290ad6886 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,20 +2,20 @@ beautifulsoup4 fake_useragent keras lxml -matplotlib # ; python_version < '3.12' +matplotlib ; python_version < '3.12' # numpy ; python_version < '3.12' git+https://github.com/cclauss/numpy.git@patch-1 -opencv-python # ; python_version < '3.12' -pandas # ; python_version < '3.12' +opencv-python ; python_version < '3.12' +pandas ; python_version < '3.12' pillow -projectq # ; python_version < '3.12' -qiskit # ; python_version < '3.12' +projectq ; python_version < '3.12' +qiskit ; python_version < '3.12' requests rich -scikit-fuzzy # ; python_version < '3.12' -scikit-learn # ; python_version < '3.12' -statsmodels # ; python_version < '3.12' -sympy # ; python_version < '3.12' +scikit-fuzzy ; python_version < '3.12' +scikit-learn ; python_version < '3.12' +statsmodels ; python_version < '3.12' +sympy ; python_version < '3.12' tensorflow ; python_version < '3.12' texttable tweepy ; python_version < '3.12' From e07fa313f0b6cbec89b5928f21a05e5cbbe7a30d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 28 May 2023 08:43:33 +0000 Subject: [PATCH 23/46] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 201290ad6886..d6e5e8b4d560 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ beautifulsoup4 fake_useragent +# numpy ; python_version < '3.12' +git+https://github.com/cclauss/numpy.git@patch-1 keras lxml matplotlib ; python_version < '3.12' -# numpy ; python_version < '3.12' -git+https://github.com/cclauss/numpy.git@patch-1 opencv-python ; python_version < '3.12' pandas ; python_version < '3.12' pillow From 28dc56bf39142af4ba548b43fa235251a806c2fd Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 18 Jun 2023 19:06:18 +0200 Subject: [PATCH 24/46] New numpy --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bba6225d714..1b9ba502e0e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install Cython git+https://github.com/cclauss/numpy.git@patch-1 + # python -m pip install Cython git+https://github.com/cclauss/numpy.git@patch-1 python -m pip install pytest-cov -r requirements.txt - name: Run tests # See: #6591 for re-enabling tests on Python v3.11 From f2492361623708410d28f88c227c79d31f60c136 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 25 Jun 2023 19:29:26 +0200 Subject: [PATCH 25/46] numpy v1.25 --- requirements.txt | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index d6e5e8b4d560..2b074a02817e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,22 @@ beautifulsoup4 fake_useragent -# numpy ; python_version < '3.12' -git+https://github.com/cclauss/numpy.git@patch-1 +numpy keras lxml -matplotlib ; python_version < '3.12' -opencv-python ; python_version < '3.12' -pandas ; python_version < '3.12' +matplotlib # ; python_version < '3.12' +opencv-python # ; python_version < '3.12' +pandas # ; python_version < '3.12' pillow -projectq ; python_version < '3.12' -qiskit ; python_version < '3.12' +projectq # ; python_version < '3.12' +qiskit # ; python_version < '3.12' requests rich -scikit-fuzzy ; python_version < '3.12' -scikit-learn ; python_version < '3.12' -statsmodels ; python_version < '3.12' -sympy ; python_version < '3.12' -tensorflow ; python_version < '3.12' +scikit-fuzzy # ; python_version < '3.12' +scikit-learn # ; python_version < '3.12' +statsmodels # ; python_version < '3.12' +sympy # ; python_version < '3.12' +tensorflow # ; python_version < '3.12' texttable -tweepy ; python_version < '3.12' -xgboost ; python_version < '3.12' +tweepy # ; python_version < '3.12' +xgboost # ; python_version < '3.12' yulewalker From 2abd28493a22363f6100d511a3d9dd7996b7b7b3 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 17:30:32 +0000 Subject: [PATCH 26/46] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2b074a02817e..40504d04093d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ beautifulsoup4 fake_useragent -numpy keras lxml matplotlib # ; python_version < '3.12' +numpy opencv-python # ; python_version < '3.12' pandas # ; python_version < '3.12' pillow From 2a02f41efc777646510a409ab0dd3977dfb582ae Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sun, 25 Jun 2023 19:33:16 +0200 Subject: [PATCH 27/46] git+https://github.com/numpy/numpy.git@main --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 40504d04093d..ee8f69865f8a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,8 @@ fake_useragent keras lxml matplotlib # ; python_version < '3.12' -numpy +# numpy +git+https://github.com/numpy/numpy.git@main opencv-python # ; python_version < '3.12' pandas # ; python_version < '3.12' pillow From 948e8082052f1badc7602360b994fa36e07cbce0 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 25 Jun 2023 17:33:47 +0000 Subject: [PATCH 28/46] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index ee8f69865f8a..4c96628ab9ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,10 +1,10 @@ beautifulsoup4 fake_useragent +# numpy +git+https://github.com/numpy/numpy.git@main keras lxml matplotlib # ; python_version < '3.12' -# numpy -git+https://github.com/numpy/numpy.git@main opencv-python # ; python_version < '3.12' pandas # ; python_version < '3.12' pillow From 4de3d47b20d3127623cdb4efad7f5e0261effb96 Mon Sep 17 00:00:00 2001 From: github-actions <${GITHUB_ACTOR}@users.noreply.github.com> Date: Thu, 7 Sep 2023 14:18:05 +0000 Subject: [PATCH 29/46] updating DIRECTORY.md --- DIRECTORY.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index 43da91cb818e..d81e4ec1ee83 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -133,6 +133,7 @@ ## Computer Vision * [Cnn Classification](computer_vision/cnn_classification.py) * [Flip Augmentation](computer_vision/flip_augmentation.py) + * [Haralick Descriptors](computer_vision/haralick_descriptors.py) * [Harris Corner](computer_vision/harris_corner.py) * [Horn Schunck](computer_vision/horn_schunck.py) * [Mean Threshold](computer_vision/mean_threshold.py) @@ -586,6 +587,7 @@ * [Greedy Coin Change](maths/greedy_coin_change.py) * [Hamming Numbers](maths/hamming_numbers.py) * [Hardy Ramanujanalgo](maths/hardy_ramanujanalgo.py) + * [Harshad Numbers](maths/harshad_numbers.py) * [Hexagonal Number](maths/hexagonal_number.py) * [Integration By Simpson Approx](maths/integration_by_simpson_approx.py) * [Interquartile Range](maths/interquartile_range.py) @@ -626,6 +628,7 @@ * [Pi Monte Carlo Estimation](maths/pi_monte_carlo_estimation.py) * [Points Are Collinear 3D](maths/points_are_collinear_3d.py) * [Pollard Rho](maths/pollard_rho.py) + * [Polygonal Numbers](maths/polygonal_numbers.py) * [Polynomial Evaluation](maths/polynomial_evaluation.py) * Polynomials * [Single Indeterminate Operations](maths/polynomials/single_indeterminate_operations.py) @@ -712,6 +715,7 @@ * Activation Functions * [Exponential Linear Unit](neural_network/activation_functions/exponential_linear_unit.py) * [Leaky Rectified Linear Unit](neural_network/activation_functions/leaky_rectified_linear_unit.py) + * [Scaled Exponential Linear Unit](neural_network/activation_functions/scaled_exponential_linear_unit.py) * [Back Propagation Neural Network](neural_network/back_propagation_neural_network.py) * [Convolution Neural Network](neural_network/convolution_neural_network.py) * [Perceptron](neural_network/perceptron.py) From 3346e1f934dadb4edb2ff1e479b2094333ce026e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:18:37 +0200 Subject: [PATCH 30/46] Upgrade GitHub Actions --- .github/workflows/build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c46e7d88ca3..2005ada06994 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,10 +9,11 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: 3.12-dev + python-version: 3.12 + allow-prereleases: true - uses: actions/cache@v3 with: path: ~/.cache/pip From 08b4566377cc87e8cc7e9ab80afb842d1460a02b Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:23:09 +0200 Subject: [PATCH 31/46] requirements.txt: matplotlib ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1128e9d66820..3cb157c59ded 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ fake_useragent imageio keras lxml -matplotlib +matplotlib ; python_version < '3.12' numpy opencv-python pandas From 6733e75fc87100e78e3299fe4788374dde8f3fa8 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:25:28 +0200 Subject: [PATCH 32/46] project_euler.yml: allow-prereleases: true --- .github/workflows/project_euler.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/project_euler.yml b/.github/workflows/project_euler.yml index 738cf30aa9a9..30036082d0ff 100644 --- a/.github/workflows/project_euler.yml +++ b/.github/workflows/project_euler.yml @@ -14,10 +14,11 @@ jobs: project-euler: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: 3.12-dev + python-version: 3.12 + allow-prereleases: true - name: Install pytest and pytest-cov run: | python -m pip install --upgrade pip @@ -26,10 +27,11 @@ jobs: validate-solutions: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: - python-version: 3.12-dev + python-version: 3.12 + allow-prereleases: true - name: Install pytest and requests run: | python -m pip install --upgrade pip From 729a1076139379019970b3ae58018aee0a837ab1 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:26:18 +0200 Subject: [PATCH 33/46] directory_writer.yml: allow-prereleases: true --- .github/workflows/directory_writer.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/directory_writer.yml b/.github/workflows/directory_writer.yml index 11374ccc1f56..ec9d581e1356 100644 --- a/.github/workflows/directory_writer.yml +++ b/.github/workflows/directory_writer.yml @@ -9,7 +9,8 @@ jobs: - uses: actions/checkout@v1 # v1, NOT v2 or v3 - uses: actions/setup-python@v4 with: - python-version: 3.12-dev + python-version: 3.12 + allow-prereleases: true - name: Write DIRECTORY.md run: | scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md From 89e9b14f33fb23641fd9d1339fca1cc4827448f7 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:28:04 +0200 Subject: [PATCH 34/46] requirements.txt: numpy==v1.26.0rc1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3cb157c59ded..3000c59714c4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ imageio keras lxml matplotlib ; python_version < '3.12' -numpy +numpy==v1.26.0rc1 opencv-python pandas pillow From ba3cf266b36a45ea4019b6d0b8502a72a46eccc7 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:42:16 +0200 Subject: [PATCH 35/46] requirements.txt: pandas ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3000c59714c4..894a20592582 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ lxml matplotlib ; python_version < '3.12' numpy==v1.26.0rc1 opencv-python -pandas +pandas ; python_version < '3.12' pillow projectq qiskit From 2295f22ecc1225c6791885b4dd410cd03ceb4773 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:51:16 +0200 Subject: [PATCH 36/46] requirements.txt: qiskit-aer ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 894a20592582..400f0e8dfdc4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -10,7 +10,7 @@ pandas ; python_version < '3.12' pillow projectq qiskit -qiskit-aer +qiskit-aer ; python_version < '3.12' requests rich scikit-fuzzy From 92b8c43807276ec88b355f96388d2f15b8b28c4d Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 16:57:07 +0200 Subject: [PATCH 37/46] requirements.txt: scikit-learn: ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 400f0e8dfdc4..6d753ed176fb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ qiskit-aer ; python_version < '3.12' requests rich scikit-fuzzy -scikit-learn +scikit-learn ; python_version < '3.12' statsmodels sympy tensorflow From 1c9ab208ef8675c70d339c984a8b23e0598026a4 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 17:01:36 +0200 Subject: [PATCH 38/46] requirements.txt: statsmodels ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6d753ed176fb..74595c12270d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ requests rich scikit-fuzzy scikit-learn ; python_version < '3.12' -statsmodels +statsmodels ; python_version < '3.12' sympy tensorflow texttable From 1ab2a805369c82fcd88f88fe0613efb6dd34b698 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 17:04:34 +0200 Subject: [PATCH 39/46] requirements.txt: tensorflow ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 74595c12270d..96adab897983 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ scikit-fuzzy scikit-learn ; python_version < '3.12' statsmodels ; python_version < '3.12' sympy -tensorflow +tensorflow ; python_version < '3.12' texttable tweepy xgboost From ef4678f20c5c9955409a3ea3df63e3b5439ff5a2 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 17:08:56 +0200 Subject: [PATCH 40/46] requirements.txt: projectq ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 96adab897983..bd77ece947e5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ numpy==v1.26.0rc1 opencv-python pandas ; python_version < '3.12' pillow -projectq +projectq ; python_version < '3.12' qiskit qiskit-aer ; python_version < '3.12' requests From 937fde5e18edd879c5b64267caabf462cc37964c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 7 Sep 2023 17:11:51 +0200 Subject: [PATCH 41/46] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index bd77ece947e5..c41ef9c2a888 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,7 +9,7 @@ opencv-python pandas ; python_version < '3.12' pillow projectq ; python_version < '3.12' -qiskit +qiskit ; python_version < '3.12' qiskit-aer ; python_version < '3.12' requests rich From ed17be455d656d6b7404dfe444f433abb429c5d8 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Sep 2023 13:39:12 +0200 Subject: [PATCH 42/46] Use new matplotlib --- requirements.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index c41ef9c2a888..4053795125ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,10 @@ fake_useragent imageio keras lxml -matplotlib ; python_version < '3.12' +matplotlib numpy==v1.26.0rc1 opencv-python -pandas ; python_version < '3.12' +pandas pillow projectq ; python_version < '3.12' qiskit ; python_version < '3.12' @@ -14,8 +14,8 @@ qiskit-aer ; python_version < '3.12' requests rich scikit-fuzzy -scikit-learn ; python_version < '3.12' -statsmodels ; python_version < '3.12' +scikit-learn +statsmodels sympy tensorflow ; python_version < '3.12' texttable From 8e7bef6f7df2245a5d11a6aef8443e9daa8bd79b Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Sep 2023 13:46:01 +0200 Subject: [PATCH 43/46] requirements.txt: pandas ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4053795125ea..e435f07ec602 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ lxml matplotlib numpy==v1.26.0rc1 opencv-python -pandas +pandas ; python_version < '3.12' pillow projectq ; python_version < '3.12' qiskit ; python_version < '3.12' From 4c7c6c8db975f8a7261a29eb1cdddd760449edba Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Sep 2023 13:47:32 +0200 Subject: [PATCH 44/46] numpy==v1.26.0rc1 opencv-python --- .github/workflows/project_euler.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/project_euler.yml b/.github/workflows/project_euler.yml index 30036082d0ff..ed68341482ad 100644 --- a/.github/workflows/project_euler.yml +++ b/.github/workflows/project_euler.yml @@ -22,7 +22,7 @@ jobs: - name: Install pytest and pytest-cov run: | python -m pip install --upgrade pip - python -m pip install --upgrade pytest pytest-cov + python -m pip install --upgrade numpy==v1.26.0rc1 pytest pytest-cov - run: pytest --doctest-modules --cov-report=term-missing:skip-covered --cov=project_euler/ project_euler/ validate-solutions: runs-on: ubuntu-latest @@ -35,7 +35,7 @@ jobs: - name: Install pytest and requests run: | python -m pip install --upgrade pip - python -m pip install --upgrade pytest requests + python -m pip install --upgrade numpy==v1.26.0rc1 pytest requests - run: pytest scripts/validate_solutions.py env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From a2bf156031f80a279779156be091415c246e6f9f Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Sep 2023 13:50:39 +0200 Subject: [PATCH 45/46] scikit-learn ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index e435f07ec602..ed6f87e0d746 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ qiskit-aer ; python_version < '3.12' requests rich scikit-fuzzy -scikit-learn +scikit-learn ; python_version < '3.12' statsmodels sympy tensorflow ; python_version < '3.12' From 4a5f6fd485a5f83229441e3b1543da3aef0c846c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 12 Sep 2023 14:10:11 +0200 Subject: [PATCH 46/46] statsmodels ; python_version < '3.12' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ed6f87e0d746..2570ca829485 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ requests rich scikit-fuzzy scikit-learn ; python_version < '3.12' -statsmodels +statsmodels ; python_version < '3.12' sympy tensorflow ; python_version < '3.12' texttable