Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
aGrUM
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
2
Issues
2
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
agrumery
aGrUM
Commits
3a376e91
Commit
3a376e91
authored
Sep 29, 2017
by
Lionel
Browse files
Options
Browse Files
Download
Plain Diff
Merging branc internal/wheelhouse_fix_2 which fixes bugs in the
wheelhouswheelhouse scipt.
parents
a6cdb559
fa3c43f9
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
3 deletions
+12
-3
METADATA.in
wrappers/pyAgrum/cmake/METADATA.in
+2
-0
egg-info.in
wrappers/pyAgrum/cmake/egg-info.in
+5
-0
setup.in.py
wrappers/pyAgrum/cmake/setup.in.py
+2
-0
build_wheels.sh
wrappers/pyAgrum/wheelhouse/build_wheels.sh
+1
-1
Dockerfile
wrappers/pyAgrum/wheelhouse/i686/Dockerfile
+1
-1
Dockerfile
wrappers/pyAgrum/wheelhouse/x86_64/Dockerfile
+1
-1
No files found.
wrappers/pyAgrum/cmake/METADATA.in
View file @
3a376e91
...
...
@@ -16,6 +16,8 @@ Classifier: Operating System :: POSIX :: Linux
Classifier: Programming Language :: C++
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 3
Classifier: Programming Language :: Python :: 3.3
Classifier: Programming Language :: Python :: 3.4
Classifier: Programming Language :: Python :: 3.5
Classifier: Programming Language :: Python :: 3.6
Classifier: Programming Language :: Python :: 2
...
...
wrappers/pyAgrum/cmake/egg-info.in
View file @
3a376e91
...
...
@@ -32,8 +32,13 @@ Framework :: IPython
Framework :: Jupyter
Programming Language :: C++
Programming Language :: Python :: 2
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.3
Programming Language :: Python :: 3.4
Programming Language :: Python :: 3.5
Programming Language :: Python :: 3.6
Topic :: Scientific/Engineering
Topic :: Scientific/Engineering :: Artificial Intelligence
...
...
wrappers/pyAgrum/cmake/setup.in.py
View file @
3a376e91
...
...
@@ -61,6 +61,8 @@ setup(
'Programming Language :: C++'
,
'Programming Language :: Python'
,
'Programming Language :: Python :: 3'
,
'Programming Language :: Python :: 3.3'
,
'Programming Language :: Python :: 3.4'
,
'Programming Language :: Python :: 3.5'
,
'Programming Language :: Python :: 3.6'
,
'Programming Language :: Python :: 2'
,
...
...
wrappers/pyAgrum/wheelhouse/build_wheels.sh
View file @
3a376e91
...
...
@@ -14,7 +14,7 @@ cp ${AGRUM_DIR}/wrappers/swig/* ${WHEELHOUSE_DIR}/pyAgrum/pyAgrum
# Extracting pyAgrum version from VERSION.txt
MAJOR
=
$(
cat
${
AGRUM_DIR
}
/VERSION.txt |
grep
AGRUM_VERSION_MAJOR |
sed
's/set(AGRUM_VERSION_MAJOR "\(.*\)")/\1/'
)
MINOR
=
$(
cat
${
AGRUM_DIR
}
/VERSION.txt |
grep
AGRUM_VERSION_MINOR |
sed
's/set(AGRUM_VERSION_MINOR "\(.*\)")/\1/'
)
PATCH
=
$(
cat
${
AGRUM_DIR
}
/VERSION.txt |
grep
'set(AGRUM_VERSION_PATCH'
|
sed
's/set(AGRUM_VERSION_PATCH "\(
[0-9]\).*
")/\1/'
|
grep
-v
AGRUM_VERSION_PATCH
)
PATCH
=
$(
cat
${
AGRUM_DIR
}
/VERSION.txt |
grep
'set(AGRUM_VERSION_PATCH'
|
sed
's/set(AGRUM_VERSION_PATCH "\(
.*\)
")/\1/'
|
grep
-v
AGRUM_VERSION_PATCH
)
if
[
-z
$MAJOR
]
then
...
...
wrappers/pyAgrum/wheelhouse/i686/Dockerfile
View file @
3a376e91
...
...
@@ -30,5 +30,5 @@ RUN make install
WORKDIR
/opt
RUN
rm
-rf
cmake-3.7.2
*
swig-3.0.12
*
RUN
rm
-f
python/cp26-cp26m
*
python/cp33-cp33m python/cp34-cp34m
RUN
rm
-f
python/cp26-cp26m
*
wrappers/pyAgrum/wheelhouse/x86_64/Dockerfile
View file @
3a376e91
...
...
@@ -30,5 +30,5 @@ RUN make install
WORKDIR
/opt
RUN
rm
-rf
cmake-3.7.2
*
swig-3.0.12
*
RUN
rm
-f
python/cp26-cp26m
*
python/cp33-cp33m python/cp34-cp34m
RUN
rm
-f
python/cp26-cp26m
*
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment