From 39833bb1cffc030d481cd13ab118dcf5f3831aca Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 4 May 2021 12:56:08 +0200 Subject: [PATCH 01/15] WIP: Do not merge -- Test on Python 3.10 beta 1 https://www.python.org/download/pre-releases/ --- .github/workflows/build.yml | 5 ++++- .github/workflows/directory_writer.yml | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7c2255275091..ca27081537f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: "3.9" + python-version: "3.10" - uses: actions/cache@v2 with: path: ~/.cache/pip @@ -20,6 +20,9 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel + # sudo apt-get install libxml2 libxslt + sudo snap install libxml2 libxslt + python -m pip install matplotlib>=3.4.2 python -m pip install mypy pytest-cov -r requirements.txt - run: mypy --install-types --non-interactive . - name: Run tests diff --git a/.github/workflows/directory_writer.yml b/.github/workflows/directory_writer.yml index be8154a32696..98e1ae840b64 100644 --- a/.github/workflows/directory_writer.yml +++ b/.github/workflows/directory_writer.yml @@ -8,6 +8,8 @@ jobs: steps: - uses: actions/checkout@v1 # v1, NOT v2 - uses: actions/setup-python@v2 + with: + python-version: "3.10" - name: Write DIRECTORY.md run: | scripts/build_directory_md.py 2>&1 | tee DIRECTORY.md From 748630654b70d6e459055e35797f8abb3f2a9fb8 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 5 Oct 2021 18:07:26 +0200 Subject: [PATCH 02/15] opencv-python is not yet compatible with Python 3.10 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4867de26f8f1..3ac202904a98 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ keras lxml matplotlib numpy -opencv-python +opencv-python; python_version < '3.10' pandas pillow qiskit From f4f91915ba5adec6a51839dec5032e539a9e56fb Mon Sep 17 00:00:00 2001 From: github-actions <${GITHUB_ACTOR}@users.noreply.github.com> Date: Tue, 5 Oct 2021 16:08:30 +0000 Subject: [PATCH 03/15] updating DIRECTORY.md --- DIRECTORY.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index 2e9942b5bf93..505ae0a26930 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -274,6 +274,7 @@ * [Test Send File](https://github.com/TheAlgorithms/Python/blob/master/file_transfer/tests/test_send_file.py) ## Fractals + * [Julia Sets](https://github.com/TheAlgorithms/Python/blob/master/fractals/julia_sets.py) * [Koch Snowflake](https://github.com/TheAlgorithms/Python/blob/master/fractals/koch_snowflake.py) * [Mandelbrot](https://github.com/TheAlgorithms/Python/blob/master/fractals/mandelbrot.py) * [Sierpinski Triangle](https://github.com/TheAlgorithms/Python/blob/master/fractals/sierpinski_triangle.py) @@ -424,10 +425,12 @@ * [Binomial Distribution](https://github.com/TheAlgorithms/Python/blob/master/maths/binomial_distribution.py) * [Bisection](https://github.com/TheAlgorithms/Python/blob/master/maths/bisection.py) * [Ceil](https://github.com/TheAlgorithms/Python/blob/master/maths/ceil.py) + * [Check Polygon](https://github.com/TheAlgorithms/Python/blob/master/maths/check_polygon.py) * [Chudnovsky Algorithm](https://github.com/TheAlgorithms/Python/blob/master/maths/chudnovsky_algorithm.py) * [Collatz Sequence](https://github.com/TheAlgorithms/Python/blob/master/maths/collatz_sequence.py) * [Combinations](https://github.com/TheAlgorithms/Python/blob/master/maths/combinations.py) * [Decimal Isolate](https://github.com/TheAlgorithms/Python/blob/master/maths/decimal_isolate.py) + * [Double Factorial Iterative](https://github.com/TheAlgorithms/Python/blob/master/maths/double_factorial_iterative.py) * [Double Factorial Recursive](https://github.com/TheAlgorithms/Python/blob/master/maths/double_factorial_recursive.py) * [Entropy](https://github.com/TheAlgorithms/Python/blob/master/maths/entropy.py) * [Euclidean Distance](https://github.com/TheAlgorithms/Python/blob/master/maths/euclidean_distance.py) From 891361136846c72070a9a1d665cc24ca6e89d654 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Tue, 5 Oct 2021 18:23:20 +0200 Subject: [PATCH 04/15] fixup! Revert libxml2 and libxslt installation --- .github/workflows/build.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca27081537f2..3c06976acc0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,9 +20,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - # sudo apt-get install libxml2 libxslt - sudo snap install libxml2 libxslt - python -m pip install matplotlib>=3.4.2 python -m pip install mypy pytest-cov -r requirements.txt - run: mypy --install-types --non-interactive . - name: Run tests From 871272c1ace14cc8497f1b277dda880d534350fe Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 16 Oct 2021 08:22:38 +0200 Subject: [PATCH 05/15] git+https://github.com/opencv/opencv-python.git@master; python_version >= '3.10' --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 3ac202904a98..23a300b35df5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,6 +5,7 @@ lxml matplotlib numpy opencv-python; python_version < '3.10' +git+https://github.com/opencv/opencv-python.git@master; python_version >= '3.10' pandas pillow qiskit From b89356864a9d498eee2f0f149bc7f79366a7d9cc Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Sat, 16 Oct 2021 08:34:45 +0200 Subject: [PATCH 06/15] git+https://github.com/opencv/opencv-python.git; python_version >= '3.10' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 23a300b35df5..db033ad172ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ lxml matplotlib numpy opencv-python; python_version < '3.10' -git+https://github.com/opencv/opencv-python.git@master; python_version >= '3.10' +git+https://github.com/opencv/opencv-python.git; python_version >= '3.10' pandas pillow qiskit From b6cb93c4a589991320afa443afb66fbda754727c Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 21 Oct 2021 08:08:08 +0200 Subject: [PATCH 07/15] Opencv-python is now Py3.10 compatible --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index db033ad172ea..4867de26f8f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,8 +4,7 @@ keras lxml matplotlib numpy -opencv-python; python_version < '3.10' -git+https://github.com/opencv/opencv-python.git; python_version >= '3.10' +opencv-python pandas pillow qiskit From 603d71ceffddc98004376dca17dabef370fcffb2 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 21 Oct 2021 08:31:17 +0200 Subject: [PATCH 08/15] tensorflow; python_version < '3.10' --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4867de26f8f1..52d1eaf10ed4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,6 +13,6 @@ scikit-fuzzy sklearn statsmodels sympy -tensorflow +tensorflow; python_version < '3.10' types-requests xgboost From 32b00ae1eec9ade5ede7b97fb6608f2373ef0739 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 21 Oct 2021 09:32:04 +0200 Subject: [PATCH 09/15] python -m pip install --upgrade numpy --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c06976acc0c..c023f30a6f5a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel + python -m pip install --upgrade numpy python -m pip install mypy pytest-cov -r requirements.txt - run: mypy --install-types --non-interactive . - name: Run tests From f6620c019c3ea406a70b4da170b482d52e3841ef Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 21 Oct 2021 12:44:40 +0200 Subject: [PATCH 10/15] python -m pip install --upgrade h5py --- .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 c023f30a6f5a..c1d42461c2ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install --upgrade numpy + python -m pip install --upgrade h5py python -m pip install mypy pytest-cov -r requirements.txt - run: mypy --install-types --non-interactive . - name: Run tests From 4f702322b649ab4e33460895ff65031470d048b1 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 21 Oct 2021 16:56:33 +0200 Subject: [PATCH 11/15] Update build.yml --- .github/workflows/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1d42461c2ff..3c06976acc0c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,6 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools six wheel - python -m pip install --upgrade h5py python -m pip install mypy pytest-cov -r requirements.txt - run: mypy --install-types --non-interactive . - name: Run tests From f67201f316f1a469ac721e0577edfa0d4cb32502 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 29 Oct 2021 11:53:11 +0200 Subject: [PATCH 12/15] Update requirements.txt --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 52d1eaf10ed4..4cc00d3543ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,4 @@ sklearn statsmodels sympy tensorflow; python_version < '3.10' -types-requests xgboost From 23cb105d2b5f52afd732d60ef455c082e26a260e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 29 Oct 2021 11:54:34 +0200 Subject: [PATCH 13/15] 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 3c06976acc0c..1674364bb4b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 with: - python-version: "3.10" + python-version: "3.10" - uses: actions/cache@v2 with: path: ~/.cache/pip From 1b8750a20282759a7e233b2a85b66c6f248979c3 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Thu, 4 Nov 2021 17:10:32 +0100 Subject: [PATCH 14/15] Update requirements.txt --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4cc00d3543ea..4867de26f8f1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,5 +13,6 @@ scikit-fuzzy sklearn statsmodels sympy -tensorflow; python_version < '3.10' +tensorflow +types-requests xgboost From b55658b25448ec62cb0cad1e0f47f2258b85cd12 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Fri, 5 Nov 2021 06:31:43 +0100 Subject: [PATCH 15/15] matplotlib>=3.4.3 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4867de26f8f1..26d908da5730 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ beautifulsoup4 fake_useragent keras lxml -matplotlib +matplotlib>=3.4.3 numpy opencv-python pandas