Skip to content

Fix python3 relative import issue and setup.py #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Aug 17, 2018
Merged

Fix python3 relative import issue and setup.py #264

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d76ba17
Fix python3 relative import issue and setup.py
pmai Aug 10, 2018
4dc3ca7
Merge branch 'master' into feature/python3-build-fix
Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
import os
import subprocess
import sys
import re
from distutils.spawn import find_executable

from setuptools import setup
from setuptools.command.install import install
from setuptools.command.build_py import build_py

# configure the version number
from shutil import copyfile
Expand All @@ -24,7 +25,7 @@
package_name = 'osi3'
package_path = os.path.join(os.getcwd(), package_name)

class GenerateProtobuf(install):
class GenerateProtobufCommand(build_py):

@staticmethod
def find_protoc():
Expand Down Expand Up @@ -71,14 +72,23 @@ def find_protoc():
""" Generate Protobuf Messages """

def run(self):
if sys.hexversion >= 0x3000000:
pattern = re.compile('^import "osi_')
for source in self.osi_files:
with open(source) as src_file:
with open(os.path.join(package_path, source),"w") as dst_file:
for line in src_file:
dst_file.write(pattern.sub('import "osi3/osi_',line))
for source in self.osi_files:
sys.stdout.write('Protobuf-compiling ' + source + '\n')
source_path = os.path.join(package_path, source) if sys.hexversion >= 0x3000000 else './' + source
subprocess.check_call([self.find_protoc(),
'--proto_path=' + package_path,
'--proto_path=.',
'--python_out=' + package_path,
'./' + source])
source_path])

install.run(self)
build_py.run(self)

try:
os.mkdir(package_path)
Expand All @@ -103,7 +113,7 @@ def run(self):
packages=[package_name],
install_requires=['protobuf'],
cmdclass={
'install': GenerateProtobuf,
'build_py': GenerateProtobufCommand,
},
url='https://github.com/OpenSimulationInterface/open-simulation-interface',
license="MPL 2.0",
Expand Down