From 031d177b6fd3b23d023a6e68dff1aa6b56bf7318 Mon Sep 17 00:00:00 2001
From: Anatolii Lishchynskyi <anatolii.lishchynskyi@cossacklabs.com>
Date: Wed, 13 Dec 2023 00:40:48 +0200
Subject: [PATCH] Remove pythemis_{make,install}_wheel (#1042)

After stable was merged into master, wheel generation is no longer
needed since `make pythemis_install` just works when virtualenv is
activated.
---
 .github/workflows/test-python.yaml |  5 ++---
 CHANGELOG.md                       |  8 ++------
 Makefile                           | 19 -------------------
 3 files changed, 4 insertions(+), 28 deletions(-)

diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
index 56bd2f020..75ec59bd6 100644
--- a/.github/workflows/test-python.yaml
+++ b/.github/workflows/test-python.yaml
@@ -58,7 +58,7 @@ jobs:
           sudo sh -c 'echo "DEBIAN_FRONTEND=noninteractive" >> /etc/environment'
           sudo apt update
           sudo apt install --yes gcc make libssl-dev \
-            python3 python3-setuptools python3-pip python3-venv
+            python3 python3-pip python3-venv
       - name: Check out code
         uses: actions/checkout@v2
       - name: Prepare Themis Core
@@ -70,8 +70,7 @@ jobs:
         run: mkdir /tmp/test_venv && python3 -m venv /tmp/test_venv
       - name: Install PyThemis into virtualenv
         run: |
-          make pythemis_make_wheel
-          source /tmp/test_venv/bin/activate && make pythemis_install_wheel
+          source /tmp/test_venv/bin/activate && make pythemis_install
       - name: Run test suite
         run: source /tmp/test_venv/bin/activate && make test_python
       - name: Uninstall PyThemis
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9f516e256..a1d2f8c85 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -50,12 +50,8 @@ _Code:_
   - `pythemis.scomparator` and `pythemis.skeygen` are now imported with `from pythemis import *` ([#914](https://github.com/cossacklabs/themis/pull/914)).
   - Pythemis supports `pyproject.toml` as a main way of building packages. The old `setup.py` is preserved for backwards compatibility ([#1006](https://github.com/cossacklabs/themis/pull/1006)).
 
-  - New installation methods, accessible with make ([#1023](https://github.com/cossacklabs/themis/pull/1023)).
-    - create/install `.whl` package for virtualenv
-    - create/install `.deb` or `.rpm` package for system-wide installation
-
-  - New installation methods, accessible with make ([#1023](https://github.com/cossacklabs/themis/pull/1023)).
-    - create/install `.whl` package for virtualenv
+  - New installation methods, accessible with make ([#1023](https://github.com/cossacklabs/themis/pull/1023), [#1042](https://github.com/cossacklabs/themis/pull/1042)).
+    - install package into virtualenv
     - create/install `.deb` or `.rpm` package for system-wide installation
 
 - **Ruby**
diff --git a/Makefile b/Makefile
index 7d7ebb56e..184982b53 100644
--- a/Makefile
+++ b/Makefile
@@ -629,25 +629,6 @@ endif
 	@echo -n "pythemis install "
 	@$(BUILD_CMD_)
 
-pythemis_make_wheel: CMD = cd src/wrappers/themis/python/ && python3 setup.py bdist_wheel
-pythemis_make_wheel:
-ifeq ($(PYTHON3_VERSION),)
-	@echo "python3 not found"
-	@exit 1
-endif
-	@echo -n "pythemis make wheel "
-	@$(BUILD_CMD_)
-	@echo Result: src/wrappers/themis/python/dist/pythemis-$(VERSION_SHORT)-py2.py3-none-any.whl
-
-pythemis_install_wheel: CMD = pip install src/wrappers/themis/python/dist/pythemis-$(VERSION_SHORT)-py2.py3-none-any.whl
-pythemis_install_wheel:
-ifeq ($(PYTHON3_VERSION),)
-	@echo "python3 not found"
-	@exit 1
-endif
-	@echo -n "pythemis install wheel "
-	@$(BUILD_CMD_)
-
 ########################################################################
 #
 # Packaging Themis Core: Linux distributions