Merge pull request #3 from SRVFI-Raws/main

support macos 11
Final2x · Jul 5, 2023 · 87f07dc · 87f07dc
2 parents 457bdb3 + 700c815
commit 87f07dc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 19 deletions.
diff --git a/.github/workflows/CI-Linux-x64-Clang.yml b/.github/workflows/CI-Linux-x64-Clang.yml
@@ -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:
 

diff --git a/.github/workflows/CI-Linux-x64-GCC.yml b/.github/workflows/CI-Linux-x64-GCC.yml
@@ -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:
 

diff --git a/.github/workflows/CI-MacOS-Universal-Clang.yml b/.github/workflows/CI-MacOS-Universal-Clang.yml
@@ -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

diff --git a/.github/workflows/CI-Windows-x64-MSVC.yml b/.github/workflows/CI-Windows-x64-MSVC.yml
@@ -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:
 

diff --git a/setup.py b/setup.py
@@ -4,6 +4,8 @@
 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):
@@ -14,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"},
     }
@@ -26,7 +28,7 @@ def finalize_options(self):
 
 setup(
     name='realesrgan_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',

diff --git a/version.txt b/version.txt