Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
4fa58f08
Commit
4fa58f08
authored
8 years ago
by
kpayson64
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #7424 from soltanmm/macverfix
Force the Python host version on Mac OS X
parents
413d302d
398b06e8
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup.py
+6
-0
6 additions, 0 deletions
setup.py
tools/distrib/python/grpcio_tools/setup.py
+6
-0
6 additions, 0 deletions
tools/distrib/python/grpcio_tools/setup.py
with
12 additions
and
0 deletions
setup.py
+
6
−
0
View file @
4fa58f08
...
@@ -30,10 +30,12 @@
...
@@ -30,10 +30,12 @@
"""
A setup module for the GRPC Python package.
"""
"""
A setup module for the GRPC Python package.
"""
from
distutils
import
extension
as
_extension
from
distutils
import
extension
as
_extension
from
distutils
import
util
import
os
import
os
import
os.path
import
os.path
import
pkg_resources
import
pkg_resources
import
platform
import
platform
import
re
import
shlex
import
shlex
import
shutil
import
shutil
import
sys
import
sys
...
@@ -133,6 +135,10 @@ if 'darwin' in sys.platform and PY3:
...
@@ -133,6 +135,10 @@ if 'darwin' in sys.platform and PY3:
if
mac_target
and
(
pkg_resources
.
parse_version
(
mac_target
)
<
if
mac_target
and
(
pkg_resources
.
parse_version
(
mac_target
)
<
pkg_resources
.
parse_version
(
'
10.7.0
'
)):
pkg_resources
.
parse_version
(
'
10.7.0
'
)):
os
.
environ
[
'
MACOSX_DEPLOYMENT_TARGET
'
]
=
'
10.7
'
os
.
environ
[
'
MACOSX_DEPLOYMENT_TARGET
'
]
=
'
10.7
'
os
.
environ
[
'
_PYTHON_HOST_PLATFORM
'
]
=
re
.
sub
(
r
'
macosx-[0-9]+\.[0-9]+-(.+)
'
,
r
'
macosx-10.7-\1
'
,
util
.
get_platform
())
def
cython_extensions
(
module_names
,
extra_sources
,
include_dirs
,
def
cython_extensions
(
module_names
,
extra_sources
,
include_dirs
,
...
...
This diff is collapsed.
Click to expand it.
tools/distrib/python/grpcio_tools/setup.py
+
6
−
0
View file @
4fa58f08
...
@@ -28,11 +28,13 @@
...
@@ -28,11 +28,13 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
from
distutils
import
extension
from
distutils
import
extension
from
distutils
import
util
import
errno
import
errno
import
os
import
os
import
os.path
import
os.path
import
pkg_resources
import
pkg_resources
import
platform
import
platform
import
re
import
shlex
import
shlex
import
shutil
import
shutil
import
sys
import
sys
...
@@ -83,6 +85,10 @@ if 'darwin' in sys.platform and PY3:
...
@@ -83,6 +85,10 @@ if 'darwin' in sys.platform and PY3:
if
mac_target
and
(
pkg_resources
.
parse_version
(
mac_target
)
<
if
mac_target
and
(
pkg_resources
.
parse_version
(
mac_target
)
<
pkg_resources
.
parse_version
(
'
10.9.0
'
)):
pkg_resources
.
parse_version
(
'
10.9.0
'
)):
os
.
environ
[
'
MACOSX_DEPLOYMENT_TARGET
'
]
=
'
10.9
'
os
.
environ
[
'
MACOSX_DEPLOYMENT_TARGET
'
]
=
'
10.9
'
os
.
environ
[
'
_PYTHON_HOST_PLATFORM
'
]
=
re
.
sub
(
r
'
macosx-[0-9]+\.[0-9]+-(.+)
'
,
r
'
macosx-10.9-\1
'
,
util
.
get_platform
())
def
package_data
():
def
package_data
():
tools_path
=
GRPC_PYTHON_TOOLS_PACKAGE
.
replace
(
'
.
'
,
os
.
path
.
sep
)
tools_path
=
GRPC_PYTHON_TOOLS_PACKAGE
.
replace
(
'
.
'
,
os
.
path
.
sep
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment