Skip to content

Commit 9c18116

Browse files
committed
Modify metadata/dockerfile/travis to prepare merge
1 parent 840fd64 commit 9c18116

4 files changed

Lines changed: 6 additions & 20 deletions

File tree

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
env:
22
global:
3-
- CIBW_BEFORE_BUILD="yum install -y gcc && yum install -y glibc.i686 && pip install
4-
numpy cython && cd requirements && bash install_cmake.bash && bash clone.bash
5-
&& bash build.bash"
6-
- CIBW_TEST_REQUIRES="nose2"
7-
- CIBW_TEST_COMMAND="cd {project}/test && nose2"
8-
- CIBW_SKIP="cp33-* cp34-*"
93
- TWINE_USERNAME=mmatl
104
matrix:
115
include:

README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
# Disclaimer
2-
This is fork of https://github.com/BerkeleyAutomation/python-fcl intented to be used in [ifcopenshell](https://github.com/IfcOpenShell/IfcOpenShell) / [BlenderBIM Add-on](https://blenderbim.org/) as orgininal repo is currently unactive and is not merging any PR.
3-
41
# python-fcl
52
### Python Interface for the Flexible Collision Library
63

build_dependencies/Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,11 @@
66
# ln -sf requirements/Dockerfile .
77
# docker build . -t pythonfcl
88

9-
FROM quay.io/pypa/manylinux_2_24_x86_64:latest
10-
11-
# clone FCL and libccd
12-
# the exact checkouts are in clone.bash
13-
COPY requirements/clone.bash .
14-
RUN bash clone.bash
9+
FROM quay.io/pypa/manylinux2010_x86_64:latest
1510

1611
# build and install libccd and fcl using cmake
17-
COPY requirements/build.bash .
18-
RUN bash build.bash
12+
COPY build_dependencies/install_linux.sh .
13+
RUN bash install_linux.sh
1914

2015
# manylinux includes a bunch of pythons
2116
# to test with others change this env variable
@@ -31,4 +26,4 @@ COPY . /python_fcl
3126
RUN pip wheel /python_fcl --no-deps -w wheelhouse/
3227
RUN pip install /python_fcl --no-index -f /wheelhouse
3328
RUN ls /wheelhouse
34-
RUN auditwheel repair wheelhouse/python_fcl-0.6.1-cp39-cp39-linux_x86_64.whl --plat manylinux_2_24_x86_64 -w /wheelhouse
29+
RUN auditwheel repair wheelhouse/python_fcl-0.6.1-cp39-cp39-linux_x86_64.whl --plat manylinux2010_x86_64 -w /wheelhouse

setup.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ long_description_content_type = text/markdown
77
url = https://github.com/CyrilWaechter/python-fcl
88
author = Jelle Feringa, Matthew Matl, Shirokuma, Michael Dawson-Haggerty, See contributor list
99
author_email = jelleferinga@gmail.com, mmatl@eecs.berkeley.edu, rootstock_acg@yahoo.co.jp
10-
maintainer = Cyril Waechter
11-
maintainer_email = cyrwae@hotmail.com
10+
maintainer = Matthew Matl
11+
maintainer_email = mmatl@eecs.berkeley.edu
1212
license = BSD
1313
license_files = LICENSE
1414
classifiers =

0 commit comments

Comments
 (0)