Skip to content

Commit

Permalink
build without debug, prepare for 0.8.3
Browse files Browse the repository at this point in the history
  • Loading branch information
gijzelaerr committed Jul 8, 2020
1 parent c2a493c commit a15ac81
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
15 changes: 12 additions & 3 deletions doc/developer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ Then run

.. code-block::
$ make wheels
$ twine upload dist/*.whl dist/*.tar.gz
$ make docker-wheels
$ venv/bin/pip install twine
$ venv/bin/twine upload dist/*.whl dist/*.tar.gz
Expand All @@ -70,51 +71,59 @@ Making binary wheel for OSX
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
3. install requirements

.. code-block::
brew install python3 bison cmake mercurial pyenv openssl
4. get monetdb

.. code-block::
hg clone hg://dev.monetdb.org/hg/MonetDB
5. build monetdb

.. code-block::
cd MonetDB
mkdir build
cd build
cmake .. -DPY3INTEGRATION=OFF -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison -DCMAKE_INSTALL_PREFIX=~/opt -DWITH_CRYPTO=OFF -DINT128=ON
cmake .. -DPY3INTEGRATION=OFF -DBISON_EXECUTABLE=/usr/local/opt/bison/bin/bison -DCMAKE_INSTALL_PREFIX=~/opt -DWITH_CRYPTO=OFF -DINT128=ON -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF
make -j10 install
6. install the pythons

.. code-block::
pyenv install 3.6.10
pyenv install 3.7.7
pyenv install 3.8.2
7. set some flags to find the monetdb libs

.. code-block::
export CFLAGS="-I/Users/gijs/opt/include -L/Users/gijs/opt/lib"
export DYLD_LIBRARY_PATH=/Users/gijs/opt/lib
8. make the binary wheels

.. code-block::
~/.pyenv/versions/3.6.10/bin/python setup.py bdist_wheel
~/.pyenv/versions/3.7.7/bin/python setup.py bdist_wheel
~/.pyenv/versions/3.8.2/bin/python setup.py bdist_wheel
9 fix the binary wheels

.. code-block::
~/.pyenv/versions/3.8.2/bin/pip install delocate
~/.pyenv/versions/3.8.2/bin/delocate-wheel -v dist/*.whl
10 upload the wheels

.. code-block::
~/.pyenv/versions/3.8.2/bin/pip install twine
Expand Down
2 changes: 1 addition & 1 deletion docker/test38.docker
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN curl -O https://dev.monetdb.org/hg/MonetDB/archive/oscar.tar.bz2
RUN tar jxvf oscar.tar.bz2
RUN mkdir /tmp/MonetDB-oscar/build
WORKDIR /tmp/MonetDB-oscar/build
RUN cmake .. -DWITH_CRYPTO=OFF -DINT128=ON -DPY3INTEGRATION=OFF
RUN cmake .. -DWITH_CRYPTO=OFF -DINT128=ON -DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF
RUN make -j 4
RUN make install

Expand Down
2 changes: 1 addition & 1 deletion docker/wheel.docker
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN mkdir /build && \
tar jxvf oscar.tar.bz2 && \
mkdir /build/MonetDB-oscar/build && \
cd /build/MonetDB-oscar/build && \
cmake3 .. -DPython3_EXECUTABLE=/opt/python/cp38-cp38/bin/python -DWITH_CRYPTO=OFF -DINT128=ON -DPY3INTEGRATION=OFF && \
cmake3 .. -DPython3_EXECUTABLE=/opt/python/cp38-cp38/bin/python -DWITH_CRYPTO=OFF -DINT128=ON -DPY3INTEGRATION=OFF -DCMAKE_BUILD_TYPE=Release -DASSERT=OFF && \
make -j 4 && \
make install && \
cp /build/MonetDB-oscar/clients/mapilib/mapi_querytype.h /usr/local/include/monetdb/ && \
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

setuptools.setup(
name="monetdbe",
version="0.8.2",
version="0.8.3",
author="Gijs Molenaar",
author_email="gijs@pythonic.nl",
description="MonetDBe - the Python embedded MonetDB",
Expand Down

0 comments on commit a15ac81

Please sign in to comment.