Skip to content
This repository has been archived by the owner on Nov 13, 2023. It is now read-only.

Commit

Permalink
fix to setup.cfg (#159)
Browse files Browse the repository at this point in the history
* remove block to install 3.8.1+ 

* building on several 3 Python versions now each commit.

* bump version, update changelog
  • Loading branch information
Keith Roberts authored Nov 26, 2020
1 parent d48ca7c commit 02aa91e
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 15 deletions.
48 changes: 43 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,31 @@ version: 2
jobs:
lint:
docker:
- image: circleci/python:3.7.4
- image: circleci/python:3.8.1
steps:
- checkout
- run: pip install -U black flake8 --user
- run: black --check .
- run: flake8 .
build:
#working_directory: ~/working
build_3.8.1:
docker:
- image: circleci/python:3.8.1
steps:
- checkout
- run: python --version
- run: pip --version
- run: sudo apt install -y libopenmpi3 libopenmpi-dev openmpi-bin
- run: sudo apt-get update && sudo apt install -y cmake
- run: sudo apt-get install libboost-all-dev
- run: sudo apt-get install libmpfr-dev
- run: git clone https://github.com/CGAL/cgal.git && cd cgal/ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && sudo make install
- run: sudo apt install -y libhdf5-dev
- run: sudo apt install -y python-pybind11
- run: pip install . --user
- run:
pip install tox --user && pip uninstall -y virtualenv && tox -e py38
- run: bash <(curl -s https://codecov.io/bash)
build_3.7.4:
docker:
- image: circleci/python:3.7.4
steps:
Expand All @@ -26,11 +43,32 @@ jobs:
- run: sudo apt install -y python-pybind11
- run: pip install . --user
- run:
pip install tox --user && tox
pip install tox --user && tox -e py37
- run: bash <(curl -s https://codecov.io/bash)
build_3.6.5:
docker:
- image: circleci/python:3.6.5-stretch
steps:
- checkout
- run: python --version
- run: pip --version
- run: sudo apt-get update && sudo apt-cache search openmpi && sudo apt install -y libopenmpi2 libopenmpi-dev openmpi-bin
- run: sudo apt-get update && sudo apt install -y cmake
- run: sudo apt-get install libboost-all-dev
- run: sudo apt-get install libmpfr-dev
- run: git clone https://github.com/CGAL/cgal.git && cd cgal/ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && sudo make install
- run: sudo apt install -y libhdf5-dev
- run: pip install pytest --user && git clone https://github.com/pybind/pybind11.git && cd pybind11 && mkdir build && cd build && cmake .. && sudo make install
- run: pip install . --user
- run:
pip install tox --user && /home/circleci/.local/bin/tox -e py36
- run: bash <(curl -s https://codecov.io/bash)

workflows:
version: 2
lint_and_build:
jobs:
- lint
- build
- build_3.6.5
- build_3.7.4
- build_3.8.1
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,12 @@ Changelog
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## Unreleased
- None
## Unreleased
- Unit testing three versions of Python.

## [3.1.5] - 2020-11-24
- Support for constraining/immersing subdomains represented as signed distance functions.
- Faster cell manipulation operations for ~5-10% better speedups in parallel.
- Faster cell manipulation operations for ~5-10% better speedups in parallel.
- Projection of points back onto level set.

## [3.1.4] - 2020-11-15
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = SeismicMesh
version = 3.1.5
version = 3.1.6
url = https://github.com/krober10nd/SeismicMesh
author = Keith Roberts
email = [email protected]
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
print("Python 3.0 or higher required, please upgrade.")
sys.exit(1)

if sys.version_info > (3, 8):
if sys.version_info >= (3, 9, 0):
print(
"Python 3.9 or higher is not yet supported, please use an older Python version."
"Python 3.9.0 or higher is not yet supported, please use an older Python version."
)
sys.exit(1)

Expand Down
8 changes: 4 additions & 4 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py3
envlist = py36, py37, py38
isolated_build = True

[mpi]
Expand All @@ -16,6 +16,6 @@ deps =
mpi4py
whitelist_externals = {[mpi]mpiexec}
commands =
{[mpi]mpiexec} -n 2 -mca btl ^openib pytest -s --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term -m "parallel2"
{[mpi]mpiexec} -n 2 -mca btl ^openib pytest -s --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term --cov-append -m "parallel3"
pytest --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term --cov-append -m "serial"
{[mpi]mpiexec} -n 2 -mca btl ^openib pytest --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term --ignore=pybind11 -m "parallel2"
{[mpi]mpiexec} -n 2 -mca btl ^openib pytest --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term --ignore=pybind11 --cov-append -m "parallel3"
pytest --cov {envsitepackagesdir}/SeismicMesh --cov-report xml --cov-report term --ignore=pybind11 --cov-append -m "serial"

0 comments on commit 02aa91e

Please sign in to comment.