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

Commit 02aa91e

Browse files
author
Keith Roberts
authored
fix to setup.cfg (#159)
* remove block to install 3.8.1+ * building on several 3 Python versions now each commit. * bump version, update changelog
1 parent d48ca7c commit 02aa91e

File tree

5 files changed

+53
-15
lines changed

5 files changed

+53
-15
lines changed

.circleci/config.yml

+43-5
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,31 @@ version: 2
33
jobs:
44
lint:
55
docker:
6-
- image: circleci/python:3.7.4
6+
- image: circleci/python:3.8.1
77
steps:
88
- checkout
99
- run: pip install -U black flake8 --user
1010
- run: black --check .
1111
- run: flake8 .
12-
build:
13-
#working_directory: ~/working
12+
build_3.8.1:
13+
docker:
14+
- image: circleci/python:3.8.1
15+
steps:
16+
- checkout
17+
- run: python --version
18+
- run: pip --version
19+
- run: sudo apt install -y libopenmpi3 libopenmpi-dev openmpi-bin
20+
- run: sudo apt-get update && sudo apt install -y cmake
21+
- run: sudo apt-get install libboost-all-dev
22+
- run: sudo apt-get install libmpfr-dev
23+
- run: git clone https://github.com/CGAL/cgal.git && cd cgal/ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && sudo make install
24+
- run: sudo apt install -y libhdf5-dev
25+
- run: sudo apt install -y python-pybind11
26+
- run: pip install . --user
27+
- run:
28+
pip install tox --user && pip uninstall -y virtualenv && tox -e py38
29+
- run: bash <(curl -s https://codecov.io/bash)
30+
build_3.7.4:
1431
docker:
1532
- image: circleci/python:3.7.4
1633
steps:
@@ -26,11 +43,32 @@ jobs:
2643
- run: sudo apt install -y python-pybind11
2744
- run: pip install . --user
2845
- run:
29-
pip install tox --user && tox
46+
pip install tox --user && tox -e py37
3047
- run: bash <(curl -s https://codecov.io/bash)
48+
build_3.6.5:
49+
docker:
50+
- image: circleci/python:3.6.5-stretch
51+
steps:
52+
- checkout
53+
- run: python --version
54+
- run: pip --version
55+
- run: sudo apt-get update && sudo apt-cache search openmpi && sudo apt install -y libopenmpi2 libopenmpi-dev openmpi-bin
56+
- run: sudo apt-get update && sudo apt install -y cmake
57+
- run: sudo apt-get install libboost-all-dev
58+
- run: sudo apt-get install libmpfr-dev
59+
- run: git clone https://github.com/CGAL/cgal.git && cd cgal/ && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && sudo make install
60+
- run: sudo apt install -y libhdf5-dev
61+
- run: pip install pytest --user && git clone https://github.com/pybind/pybind11.git && cd pybind11 && mkdir build && cd build && cmake .. && sudo make install
62+
- run: pip install . --user
63+
- run:
64+
pip install tox --user && /home/circleci/.local/bin/tox -e py36
65+
- run: bash <(curl -s https://codecov.io/bash)
66+
3167
workflows:
3268
version: 2
3369
lint_and_build:
3470
jobs:
3571
- lint
36-
- build
72+
- build_3.6.5
73+
- build_3.7.4
74+
- build_3.8.1

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -511,12 +511,12 @@ Changelog
511511
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
512512
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
513513

514-
## Unreleased
515-
- None
514+
## Unreleased
515+
- Unit testing three versions of Python.
516516

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

522522
## [3.1.4] - 2020-11-15

setup.cfg

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[metadata]
22
name = SeismicMesh
3-
version = 3.1.5
3+
version = 3.1.6
44
url = https://github.com/krober10nd/SeismicMesh
55
author = Keith Roberts
66
email = keithrbt0@gmail.com

setup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
print("Python 3.0 or higher required, please upgrade.")
1717
sys.exit(1)
1818

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

tox.ini

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py3
2+
envlist = py36, py37, py38
33
isolated_build = True
44

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

0 commit comments

Comments
 (0)