Skip to content

Commit

Permalink
fix python cd
Browse files Browse the repository at this point in the history
  • Loading branch information
pantor committed Mar 29, 2021
1 parent f00adad commit f5a4131
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, macos-latest]
# os: [windows-latest, macos-latest]
os: [macos-latest]
python-version: [3.6, 3.7, 3.8, 3.9]

steps:
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "Ruckig"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 0.2.5
PROJECT_NUMBER = 0.2.6

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="2">
<name>ruckig</name>
<version>0.2.5</version>
<version>0.2.6</version>
<description>Online Trajectory Generation. Real-time. Time-optimal. Jerk-constrained.</description>
<author>Lars Berscheid</author>
<maintainer email="[email protected]">Lars Berscheid</maintainer>
Expand Down
12 changes: 5 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,19 @@ def build_extension(self, ext):
build_type = os.environ.get('BUILD_TYPE', 'Release')
build_args = ['--config', build_type]

# Pile all .so in one place and use $ORIGIN as RPATH
cmake_args = [
'-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=' + extdir,
'-DPYTHON_EXECUTABLE={}'.format(sys.executable),
'-DEXAMPLE_VERSION_INFO={}'.format(self.distribution.get_version()),
# '-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE',
# '-DCMAKE_INSTALL_RPATH={}'.format('$ORIGIN'),
'-DCMAKE_BUILD_TYPE=' + build_type,
'-DBUILD_PYTHON_MODULE=ON',
'-DBUILD_SHARED_LIBS=OFF',
'-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
]

env = os.environ.copy()
env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
self.distribution.get_version())
# env = os.environ.copy()
# env['CXXFLAGS'] = '{} -DVERSION_INFO=\\"{}\\"'.format(env.get('CXXFLAGS', ''),
# self.distribution.get_version())

if not os.path.exists(self.build_temp):
os.makedirs(self.build_temp)
Expand All @@ -70,7 +68,7 @@ def build_extension(self, ext):

setup(
name='ruckig',
version='0.2.5',
version='0.2.6',
description='Online Trajectory Generation. Real-time. Time-optimal. Jerk-constrained.',
long_description=long_description,
long_description_content_type='text/markdown',
Expand Down

0 comments on commit f5a4131

Please sign in to comment.