Skip to content

Commit

Permalink
GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@FI-Mihej
FI-Mihej committed Mar 23, 2024
1 parent 0c755ab commit ad5d974
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 50 deletions.
95 changes: 49 additions & 46 deletions .github/workflows/build__macos__shell.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ jobs:
matrix:
# macos-13 is an intel runner, macos-14 is apple silicon
os: [macos-13]
python-version: ['3.8', '3.9', '3.10', '3.11', '3.12', '3.13.0-alpha.5']
# python-version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python-version: ['3.9']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -53,51 +54,51 @@ jobs:
name: cibw-wheels-cengal-shell-${{ matrix.os }}-Py_${{ matrix.python-version }}-${{ strategy.job-index }}-${{ github.run_number }}-${{ github.run_attempt }}
path: ./wheelhouse/*.whl

build_wheels_shell__macos_arm64__cpython:
name: Build Cengal Shell wheels on ${{ matrix.os }} for CPython ${{ matrix.python-version }}
runs-on: ${{ matrix.os }}
strategy:
matrix:
# macos-13 is an intel runner, macos-14 is apple silicon
os: [macos-14]
python-version: ['3.10', '3.11', '3.12', '3.13.0-alpha.5']

steps:
- uses: actions/checkout@v4
# build_wheels_shell__macos_arm64__cpython:
# name: Build Cengal Shell wheels on ${{ matrix.os }} for CPython ${{ matrix.python-version }}
# runs-on: ${{ matrix.os }}
# strategy:
# matrix:
# # macos-13 is an intel runner, macos-14 is apple silicon
# os: [macos-14]
# python-version: ['3.10', '3.11', '3.12']

# steps:
# - uses: actions/checkout@v4

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

- name: Install basic Python dependencies
run: |
python -m pip install --upgrade pip
python -m pip install --upgrade setuptools
python -m pip install --upgrade wheel
- name: Prepare Setup Shell
run: |
chmod +x ./prepare__setup_shell.sh
./prepare__setup_shell.sh
chmod +x ./rename_wheel__github_actions__macos__cpython.sh
# - name: Set up Python ${{ matrix.python-version }}
# uses: actions/setup-python@v2
# with:
# python-version: ${{ matrix.python-version }}

# - name: Install basic Python dependencies
# run: |
# python -m pip install --upgrade pip
# python -m pip install --upgrade setuptools
# python -m pip install --upgrade wheel

# - name: Prepare Setup Shell
# run: |
# chmod +x ./prepare__setup_shell.sh
# ./prepare__setup_shell.sh
# chmod +x ./rename_wheel__github_actions__macos__cpython.sh

- name: Build wheels
run: |
python -m pip install -r ./requirements.txt
mkdir ./wheelhouse_temp/
export ARCHFLAGS="-arch arm64"
python -m pip wheel . -w ./wheelhouse_temp/ -v -v -v
ls -la ./wheelhouse_temp/
./rename_wheel__github_actions__macos__cpython.sh ${{ matrix.python-version }} ${{ matrix.os }}
mkdir ./wheelhouse/
cp -R ./wheelhouse_temp/cengal-*.whl ./wheelhouse/
ls -la ./wheelhouse/
- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-cengal-shell-${{ matrix.os }}-Py_${{ matrix.python-version }}-${{ strategy.job-index }}-${{ github.run_number }}-${{ github.run_attempt }}
path: ./wheelhouse/*.whl
# - name: Build wheels
# run: |
# python -m pip install -r ./requirements.txt
# mkdir ./wheelhouse_temp/
# export ARCHFLAGS="-arch arm64"
# python -m pip wheel . -w ./wheelhouse_temp/ -v -v -v
# ls -la ./wheelhouse_temp/
# ./rename_wheel__github_actions__macos__cpython.sh ${{ matrix.python-version }} ${{ matrix.os }}
# mkdir ./wheelhouse/
# cp -R ./wheelhouse_temp/cengal-*.whl ./wheelhouse/
# ls -la ./wheelhouse/

# - uses: actions/upload-artifact@v4
# with:
# name: cibw-wheels-cengal-shell-${{ matrix.os }}-Py_${{ matrix.python-version }}-${{ strategy.job-index }}-${{ github.run_number }}-${{ github.run_attempt }}
# path: ./wheelhouse/*.whl

build_wheels_shell__macos_x64__pypy:
name: Build Cengal Shell wheels on ${{ matrix.os }} for PyPy ${{ matrix.python-version }}
Expand All @@ -106,7 +107,8 @@ jobs:
matrix:
# macos-13 is an intel runner, macos-14 is apple silicon
os: [macos-13]
python-version: ['pypy-3.8', 'pypy-3.9', 'pypy-3.10']
# python-version: ['pypy-3.8', 'pypy-3.9', 'pypy-3.10']
python-version: ['pypy-3.8']

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -152,7 +154,8 @@ jobs:
matrix:
# macos-13 is an intel runner, macos-14 is apple silicon
os: [macos-14]
python-version: ['pypy-3.8', 'pypy-3.9', 'pypy-3.10']
# python-version: ['pypy-3.8', 'pypy-3.9', 'pypy-3.10']
python-version: ['pypy-3.8']

steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 3 additions & 4 deletions cengal_setup_scripts/install_required_packages/install_packages.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,10 +195,6 @@ def __init__(self):
'distex',
}

self.osx_allowed = {
'pyobjc'
}

self.emscripten_forbidden = {
'virtualenv',
'rocksdb',
Expand All @@ -220,6 +216,9 @@ def __init__(self):
if ('PyPy'.lower() == PLATFORM_NAME.lower()) and (PYTHON_VERSION_INT[:3] < (3, 4, 0)):
self.universal.insert(0, 'lzmaffi') # for pypy3 and Python2 only: it is backport from python34 which is
# default in Ubuntu 14.04

if 'PyPy'.lower() != PLATFORM_NAME.lower():
self.osx_allowed.add('pyobjc') # 2024.03.23: PyObjC is not supported on PyPy

if (PYTHON_VERSION_INT[:3] < (3, 5, 0)):
self.universal.insert(0, 'typing') # for pypy3 and Python2 only: it is backport from python35
Expand Down
31 changes: 31 additions & 0 deletions cengal_setup_scripts/setup/setup_shell/setup.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,37 @@


# packages_data_dict, manifest_included_files = find_package_data()
import platform
if ('PyPy'.lower() == platform.python_implementation().lower()) and ('Darwin'.lower() == platform.system().lower()):
supported_extras = [
'setuprequires',
'entities__asm_functions',
'hardware__info__cpu__versions__v_0',
'hardware__info__cpu__versions__v_1',
'cengal__time_management__relative_time__relativedelta',
'cengal__web_tools__help_tools',
'cengal__user_interface__console__chooser',
'cengal__user_interface__console__colorama_helpers',
'cengal__parallel_execution__coroutines',
'cengal__parallel_execution__coroutines__coro_standard_services__db',
'cengal__parallel_execution__coroutines__coro_standard_services__lmdb',
'cengal__parallel_execution__coroutines__coro_standard_services__log',
'cengal__parallel_execution__coroutines__coro_standard_services__loop_yield',
'cengal__parallel_execution__coroutines__coro_standard_services__read_write_locker',
'cengal__parallel_execution__coroutines__coro_standard_services__tkinter',
'cengal__parallel_execution__coroutines__coro_tools__loop_administration__admin_tk',
'cengal__data_manipulation__serialization',
'cengal__user_interface__gui__tkinter',
'cengal__text_processing__encoding_detection',
'cengal__build_tools__packages__create',
'cengal__build_tools__gather_docs',
'cengal__build_tools__build_extensions',
]
supported_extras_str = ','.join(supported_extras)
install_requires = (pypi_requirements_list + [f'cengal_light[{supported_extras_str}]=={__version__}',])
else:
install_requires = (pypi_requirements_list + [f'cengal_light[full]=={__version__}',])

setuptools.setup(
name='cengal',
version=__version__,
Expand Down

0 comments on commit ad5d974

Please sign in to comment.