Skip to content

Commit

Permalink
Remove pycmake
Browse files Browse the repository at this point in the history
The python building is done by setuptools, and pycmake is obsolete.
  • Loading branch information
jokva committed Nov 8, 2017
1 parent c64a0ba commit de9c55a
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 19 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
@@ -1,6 +1,3 @@
[submodule "pycmake"]
path = pycmake
url = https://github.com/statoil/pycmake
[submodule "multibuild"]
path = multibuild
url = https://github.com/matthew-brett/multibuild.git
9 changes: 1 addition & 8 deletions .travis.yml
Expand Up @@ -104,16 +104,9 @@ before_deploy:
# unproblematic as long as source code is uploaded from linux.
- if [[ "$TRAVIS_OS_NAME" == "linux" && ! -d segyio-$VERSION ]]; then
git clone $TRAVIS_BUILD_DIR segyio-$VERSION;
pushd segyio-$VERSION;
git submodule update --init pycmake;
popd;
tar --exclude-vcs -C $TRAVIS_BUILD_DIR -czvf segyio-$VERSION.tar.gz segyio-$VERSION;
zip --exclude *.git -r segyio-$VERSION.zip $TRAVIS_BUILD_DIR/segyio-$VERSION/*;
fi
- pushd build/python

after_deploy:
- popd

deploy:
- provider: pypi # source distribution (done from linux python 3.6 only)
Expand All @@ -136,7 +129,7 @@ deploy:
on:
tags: true

- provider: releases # upload tarball with submodule
- provider: releases # upload tarball and zip with source code
skip_cleanup: true
overwrite: true
file:
Expand Down
1 change: 0 additions & 1 deletion CMakeLists.txt
Expand Up @@ -26,7 +26,6 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(WINDOWS TRUE)
endif ()

list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/pycmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(check_includes)
include(default_warnings)
Expand Down
7 changes: 1 addition & 6 deletions README.md
Expand Up @@ -66,7 +66,7 @@ To build and use segyio you need:
To build and install segyio, perform the following actions in your console:

```
git clone --recursive https://github.com/Statoil/segyio
git clone https://github.com/Statoil/segyio
cd segyio
mkdir build
cd build
Expand All @@ -80,11 +80,6 @@ in your home directory, add `-DCMAKE_INSTALL_PREFIX=~/` or some other
appropriate directory. Remember to update your $PATH! By default, only the
python bindings are built.

Passing recursive to `git clone` also fetches statoil/pycmake and
matthew-brett/multibuild. The former is cmake features for managing python
packages, and the latter tools for building OS X and linux binary packages for
pip.

##### Matlab support #####

To build the matlab bindings, invoke CMake with the option `-DBUILD_MEX=ON`. In
Expand Down
1 change: 0 additions & 1 deletion pycmake
Submodule pycmake deleted from ba1327

0 comments on commit de9c55a

Please sign in to comment.