Skip to content

Commit 6288154

Browse files
authored
Merge pull request #331 from compas-dev/no-binary-bundling
Do not bundle V-REP's remoteApi binaries
2 parents 857b700 + 8b4647e commit 6288154

File tree

7 files changed

+7
-3
lines changed

7 files changed

+7
-3
lines changed

.github/workflows/integration.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ jobs:
3030
- name: Install
3131
run: |
3232
python -m pip install --no-cache-dir -r requirements-dev.txt
33+
# Get V-REP remote API for integration testing
34+
curl --output $(python -c "import os;import compas_fab.backends.vrep.remote_api as v; print(os.path.dirname(v.__file__))")/remoteApi.so https://wolke.ethz.ch/s/idbWPRKzJ8pFkAn/download/remoteApi.so
3335
- name: Run integration tests
3436
run: |
3537
pytest --doctest-modules --ignore-glob="**ghpython/components/**.py"

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ Unreleased
2020

2121
**Removed**
2222

23+
* Removed the bundled binary files for the `VrepClient` remote API. To use V-REP, use the `remoteApi` binaries provided with the software.
24+
2325
0.20.0
2426
----------
2527

docs/examples/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from sybil import Region
77
from sybil import Sybil
8-
from sybil.parsers.codeblock import CodeBlockParser
8+
from sybil.parsers.codeblock import PythonCodeBlockParser
99
from sybil.parsers.doctest import DocTestParser
1010

1111
LITERALPYTHON_START = re.compile(r'\.\.\s*literalinclude\s*::(.*\.py)')
@@ -42,7 +42,7 @@ def parse_literalinclude_python_blocks(document):
4242
pytest_collect_file = Sybil(
4343
parsers=[
4444
DocTestParser(),
45-
CodeBlockParser(),
45+
PythonCodeBlockParser(),
4646
parse_literalinclude_python_blocks
4747
],
4848
pattern='*.rst',
-69 KB
Binary file not shown.
-86.7 KB
Binary file not shown.
-111 KB
Binary file not shown.

tasks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ def check(ctx):
133133
lint(ctx)
134134

135135
log.write('Checking MANIFEST.in...')
136-
ctx.run('check-manifest --ignore-bad-ideas=remoteApi.so')
136+
ctx.run('check-manifest')
137137

138138
log.write('Checking ReStructuredText formatting...')
139139
ctx.run('python setup.py check --strict --metadata --restructuredtext')

0 commit comments

Comments
 (0)