Skip to content

Commit

Permalink
Merge branch 'python' into pylint-1
Browse files Browse the repository at this point in the history
  • Loading branch information
jngrad committed Oct 15, 2019
2 parents 3b716e5 + 94d51f5 commit 1ef1aeb
Show file tree
Hide file tree
Showing 1,039 changed files with 14,989 additions and 13,866 deletions.
1 change: 0 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ Checks: |
readability-redundant-control-flow,
readability-simplify-boolean-expr,
readability-simplify-subscript-expr,
readability-static-accessed-through-instance,
readability-static-definition-in-anonymous-namespace,
readability-string-compare,
readability-uniqueptr-delete-release,
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,4 @@ doc/dg/background_errors.unsorted
*.pyc

.ycm_extra_conf.py
.ipynb_checkpoints
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,9 @@ tutorials-samples-no-gpu:
empty:
<<: *global_job_definition
stage: build
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/ubuntu-python3:cuda-9.0
image: gitlab.icp.uni-stuttgart.de:4567/espressomd/docker/clang-python3:6.0
script:
- export myconfig=empty
- export myconfig=empty with_static_analysis=true
- bash maintainer/CI/build_cmake.sh
tags:
- docker
Expand Down
12 changes: 7 additions & 5 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Core developers
Florian Weik
Rudolf Weeber
Kai Szuttor

Jean-Noël Grad

Former Core Developers
----------------------
Expand All @@ -29,6 +29,7 @@ Olaf Lenz
Contributors
------------
Adolfo Poma
Alexander Reinauer
Alexander Schlaich
Alexander Weyman
Andrea Tagliabue
Expand All @@ -38,6 +39,8 @@ Ashreya Jayaram
Ben Reynwar (formerly: Reynolds)
Bogdan Tanygin
Cameron Stewart
Christian Haege
Christoph Lohrmann
Christoph Schneider
David Schwörer
David Sean
Expand All @@ -50,7 +53,6 @@ Florian Fahrenberger (formerly: Rühle)
Florian Häußermann
Francesca Lugli
Frank Mühlbach
Georg Rempfer
Gizem Inci
Gregoria Illya
Hamid Zaheri
Expand All @@ -61,7 +63,7 @@ Ira Cooke
Iva Jancigova
Ivan Cimrak
Iveta Jancigova
Jean Noel Grad
Jan Finkbeiner
Joan Josep Cerdà
Jonas Landsgesell
Jon Halverson
Expand All @@ -70,8 +72,8 @@ Josh Berryman
Julius Herb
Kai Grass
Kai Kratzer
Kai Szuttor
Karen Johnston
Kartik Jain
Kevin Kleinbeck
Konrad Breitsprecher
Le Qiao
Expand All @@ -86,6 +88,7 @@ Michael Lahnert
Milena Smiljanic
Mingyang Hu
Miru Lee
Moritz Schumacher
Muhammad Anwar
Nicolai Roth
Nils Binz
Expand All @@ -100,7 +103,6 @@ Peter Kosovan
Pierre de Buyl
Robert Kaufmann
Robin Bardakcioglu
Rudolf Weeber
Sam Foley
Sandeep Tyagi
Sascha Erhardt
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2009-2018 The ESPResSo project
# Copyright (C) 2009-2019 The ESPResSo project
# Copyright (C) 2009,2010
# Max-Planck-Institute for Polymer Research, Theory Group
#
Expand Down Expand Up @@ -28,14 +28,14 @@ endif()

enable_language(CXX)

set(PROJECT_VERSION "4.1-dev")
set(PROJECT_VERSION "5.0-dev")
string(REGEX
REPLACE "^([1-9]+)\\.[0-9]+.*$"
"\\1"
SOVERSION
"${PROJECT_VERSION}")
if(NOT ${SOVERSION} MATCHES "^[1-9]+$")
message(FATAL_ERROR "Could not determind SOVERSION from ${PROJECT_VERSION}")
message(FATAL_ERROR "Could not determine SOVERSION from ${PROJECT_VERSION}")
endif(NOT ${SOVERSION} MATCHES "^[1-9]+$")

#
Expand Down Expand Up @@ -336,7 +336,7 @@ endif(WITH_VALGRIND_INSTRUMENTATION)
# MPI
#

find_package(MPI REQUIRED)
find_package(MPI 3.0 REQUIRED)

# CMake < 3.9
if(NOT TARGET MPI::MPI_CXX)
Expand Down
Loading

0 comments on commit 1ef1aeb

Please sign in to comment.