Skip to content

Commit

Permalink
Merge pull request #2 from SRVFI-Raws/main
Browse files Browse the repository at this point in the history
support macos 11
  • Loading branch information
Tohrusky authored Jul 5, 2023
2 parents 64d5a8d + fcbaf85 commit 3040a48
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 19 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/CI-Linux-x64-Clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
paths-ignore:
- README.md
- LICENSE
- version.txt
pull_request:
pull_request:
paths-ignore:
- README.md
- LICENSE
- version.txt
workflow_dispatch:
workflow_dispatch:

jobs:

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/CI-Linux-x64-GCC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
paths-ignore:
- README.md
- LICENSE
- version.txt
pull_request:
pull_request:
paths-ignore:
- README.md
- LICENSE
- version.txt
workflow_dispatch:
workflow_dispatch:

jobs:

Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/CI-MacOS-Universal-Clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
paths-ignore:
- README.md
- LICENSE
- version.txt
pull_request:
pull_request:
paths-ignore:
- README.md
- LICENSE
- version.txt
workflow_dispatch:
workflow_dispatch:

env:
DEVELOPER_DIR: /Applications/Xcode_14.2.app/Contents/Developer
Expand Down
6 changes: 2 additions & 4 deletions .github/workflows/CI-Windows-x64-MSVC.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ on:
paths-ignore:
- README.md
- LICENSE
- version.txt
pull_request:
pull_request:
paths-ignore:
- README.md
- LICENSE
- version.txt
workflow_dispatch:
workflow_dispatch:

jobs:

Expand Down
7 changes: 5 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
from wheel.bdist_wheel import bdist_wheel as _bdist_wheel
import sys


_version = '1.3.0'

class bdist_wheel(_bdist_wheel):
def finalize_options(self):
_bdist_wheel.finalize_options(self)
Expand All @@ -13,7 +16,7 @@ def finalize_options(self):
_options = {}
if sys.platform == "darwin":
_options = {
"bdist_wheel": {"plat_name": "macosx_12_0_universal2"},
"bdist_wheel": {"plat_name": "macosx_11_0_universal2"},
} if sys.version_info[1] >= 9 else {
"bdist_wheel": {"plat_name": "macosx_10_15_x86_64"},
}
Expand All @@ -25,7 +28,7 @@ def finalize_options(self):

setup(
name='realcugan_ncnn_py',
version=open('version.txt', encoding='utf-8').read(),
version=_version,
description='',
long_description=open('README.md', encoding='utf-8').read(),
long_description_content_type='text/markdown',
Expand Down
1 change: 0 additions & 1 deletion version.txt

This file was deleted.

0 comments on commit 3040a48

Please sign in to comment.