Skip to content

Commit

Permalink
prepare for m1
Browse files Browse the repository at this point in the history
synodriver committed Feb 3, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 58824d1 commit 9c2061c
Showing 7 changed files with 41,228 additions and 27,341 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/build_whl.yml
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-22.04, macos-12, macos-14, windows-2019]
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check out recursively
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
@@ -31,7 +31,8 @@ jobs:
- name: build_whl
run: |
python setup.py sdist bdist_wheel
- uses: actions/upload-artifact@v3
python changename.py
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}-${{ matrix.python-version }}
path: dist/*.whl
8 changes: 4 additions & 4 deletions .github/workflows/unitest.yml
Original file line number Diff line number Diff line change
@@ -9,16 +9,16 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11"]
os: [ubuntu-latest, macos-latest, windows-latest]
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-22.04, macos-12, macos-14, windows-2019]
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check out recursively
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
6 changes: 3 additions & 3 deletions .github/workflows/upload.yml
Original file line number Diff line number Diff line change
@@ -10,15 +10,15 @@ jobs:
strategy:
matrix:
python-version: ["3.6", "3.7", "3.8", "3.9", "3.10", "3.11", "3.12"]
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-22.04, macos-12, macos-14, windows-2019]
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Check out recursively
run: git submodule update --init --recursive
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
12 changes: 12 additions & 0 deletions changename.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
import os
import platform

for f in os.listdir("dist"):
if "linux" in f:
os.rename(
os.path.join("dist", f),
os.path.join("dist", f.replace("linux", "manylinux2014")),
)
elif "macosx" in f:
if platform.machine() == "x86_64":
os.rename(
os.path.join("dist", f),
os.path.join("dist", f.replace("universal2", "x86_64")),
)
else:
os.rename(
os.path.join("dist", f),
os.path.join("dist", f.replace("universal2", "arm64")),
)
2 changes: 1 addition & 1 deletion ftea/__init__.py
Original file line number Diff line number Diff line change
@@ -4,4 +4,4 @@
from ftea._tea import *
from ftea._xtea import *

__version__ = "0.1.5"
__version__ = "0.1.6"
43,931 changes: 25,717 additions & 18,214 deletions ftea/_tea.c

Large diffs are not rendered by default.

24,599 changes: 15,485 additions & 9,114 deletions ftea/_xtea.c

Large diffs are not rendered by default.

0 comments on commit 9c2061c

Please sign in to comment.