Skip to content

Commit

Permalink
Remove pythemis_{make,install}_wheel (#1042)
Browse files Browse the repository at this point in the history
After stable was merged into master, wheel generation is no longer
needed since `make pythemis_install` just works when virtualenv is
activated.
  • Loading branch information
iamnotacake committed Dec 12, 2023
1 parent b74cbe3 commit 031d177
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 28 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/test-python.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
8 changes: 2 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand Down
19 changes: 0 additions & 19 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 031d177

Please sign in to comment.