Skip to content

Commit

Permalink
Merge branch 'abi3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Legrandin committed Feb 8, 2021
2 parents 4eede13 + 2d3d5d1 commit 214f62a
Show file tree
Hide file tree
Showing 10 changed files with 134 additions and 326 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ jobs:
build_wheels:
name: Build wheels on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
env:
# Build api3 only once and test separately
CIBW_BUILD: "cp27-* cp35-* pp27-* pp36-*"
CIBW_TEST_SKIP: "*"
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
Expand Down Expand Up @@ -38,4 +42,46 @@ jobs:
- uses: actions/upload-artifact@v2
with:
name: wheels
path: ./wheelhouse/*.whl

test_wheels:
name: Test wheels on ${{ matrix.os }}
needs: build_wheels
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-18.04, windows-latest, macos-latest]
python-version: ['2.7', '3.6', '3.7', '3.8', '3.9', 'pypy-2.7', 'pypy-3.6']

if: github.actor == 'Legrandin'

steps:
- uses: actions/checkout@v2

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
with:
python-version: ${{ matrix.python-version }}

- name: Display Python version
run: python -c "from __future__ import print_function; import sys; print(sys.version)"

- uses: actions/download-artifact@v2
with:
name: wheels
path: wheels/

- name: Install pycryptodome wheel
if: endsWith(github.ref, 'x') == false
run: |
pip install pycryptodome --no-index -f wheels/
- name: Install pycryptodomex wheel
if: endsWith(github.ref, 'x') == true
run: |
pip install pycryptodomex --no-index -f wheels/
- name: Test wheels
run: |
python -m Crypto.SelfTest --skip-slow-tests
9 changes: 9 additions & 0 deletions Changelog.rst
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
Changelog
=========

3.10.1 (X February 2021)
++++++++++++++++++++++++

Other changes
-------------
* Python 3 wheels use ``abi3`` ABI tag.
* Remove Appveyor CI.

3.10.0 (6 February 2021)
++++++++++++++++++++++++

Expand Down
3 changes: 0 additions & 3 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
.. image:: https://github.com/Legrandin/pycryptodome/workflows/Integration%20test/badge.svg?branch=master
:target: https://github.com/Legrandin/pycryptodome/actions

.. image:: https://ci.appveyor.com/api/projects/status/mbxyqdodw9ylfib9/branch/master?svg=true
:target: https://ci.appveyor.com/project/Legrandin/pycryptodome

PyCryptodome
============

Expand Down
89 changes: 0 additions & 89 deletions appveyor.yml

This file was deleted.

26 changes: 0 additions & 26 deletions appveyor/get_wheels.sh

This file was deleted.

88 changes: 0 additions & 88 deletions appveyor/install.ps1

This file was deleted.

83 changes: 0 additions & 83 deletions appveyor/run_with_env.cmd

This file was deleted.

2 changes: 1 addition & 1 deletion lib/Crypto/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
__all__ = ['Cipher', 'Hash', 'Protocol', 'PublicKey', 'Util', 'Signature',
'IO', 'Math']

version_info = (3, 10, 0)
version_info = (3, 10, 1, 'b0')

__version__ = ".".join([str(x) for x in version_info])
3 changes: 3 additions & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ max-line-length = 110
[metadata]
project_urls =
Source=https://github.com/Legrandin/pycryptodome/

[bdist_wheel]
py-limited-api = cp35
Loading

0 comments on commit 214f62a

Please sign in to comment.