Skip to content

Commit 10d77f6

Browse files
committed
Update CI and dates in copyright headers (#172)
* Update Pipfile.lock * Update date in copyright header * Update Travis and Danger * Use pipenv run to access YAPF * Move to Python3 only in CI
1 parent c896953 commit 10d77f6

File tree

174 files changed

+243
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+243
-241
lines changed

.ci/Dangerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ code_style_validation.check file_extensions: ['.hpp', '.cpp', '.h'],
2424
ignore_file_patterns: [/^external\//]
2525

2626
# Check code style with YAPF
27-
code_style_validation.check validator: 'yapf',
27+
code_style_validation.check validator: 'pipenv run yapf',
2828
file_extensions: ['.py'],
2929
ignore_file_patterns: [/^external\//]
3030

.ci/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ source "https://rubygems.org"
44
gem "danger"
55
gem "danger-commit_lint"
66
gem "danger-lgtm"
7-
gem 'danger-code_style_validation', '0.3.0' , :git => 'https://github.com/flix-tech/danger-code_style_validation.git'
7+
gem "danger-code_style_validation", :git => "https://github.com/flix-tech/danger-code_style_validation.git"

.ci/Gemfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,52 @@ GEM
1818
colored2 (3.1.2)
1919
cork (0.3.0)
2020
colored2 (~> 3.1)
21-
danger (5.5.10)
21+
danger (5.11.1)
2222
claide (~> 1.0)
2323
claide-plugins (>= 0.9.2)
2424
colored2 (~> 3.1)
2525
cork (~> 0.1)
2626
faraday (~> 0.9)
2727
faraday-http-cache (~> 1.0)
28-
git (~> 1)
28+
git (~> 1.5)
2929
kramdown (~> 1.5)
3030
no_proxy_fix
3131
octokit (~> 4.7)
3232
terminal-table (~> 1)
3333
danger-commit_lint (0.0.6)
3434
danger (~> 5.0)
35-
danger-lgtm (1.0.0)
35+
danger-lgtm (1.0.4)
3636
danger-plugin-api (~> 1.0)
3737
danger-plugin-api (1.0.0)
3838
danger (> 2.0)
39-
faraday (0.14.0)
39+
faraday (0.15.4)
4040
multipart-post (>= 1.2, < 3)
4141
faraday-http-cache (1.3.1)
4242
faraday (~> 0.8)
43-
git (1.3.0)
44-
kramdown (1.16.2)
43+
git (1.5.0)
44+
kramdown (1.17.0)
4545
multipart-post (2.0.0)
4646
nap (1.1.0)
4747
no_proxy_fix (0.1.2)
48-
octokit (4.8.0)
48+
octokit (4.13.0)
4949
sawyer (~> 0.8.0, >= 0.5.3)
5050
open4 (1.3.4)
51-
public_suffix (3.0.2)
51+
public_suffix (3.0.3)
5252
sawyer (0.8.1)
5353
addressable (>= 2.3.5, < 2.6)
5454
faraday (~> 0.8, < 1.0)
5555
terminal-table (1.8.0)
5656
unicode-display_width (~> 1.1, >= 1.1.1)
57-
unicode-display_width (1.3.0)
57+
unicode-display_width (1.4.1)
5858

5959
PLATFORMS
6060
ruby
6161

6262
DEPENDENCIES
6363
danger
64-
danger-code_style_validation (= 0.3.0)!
64+
danger-code_style_validation!
6565
danger-commit_lint
6666
danger-lgtm
6767

6868
BUNDLED WITH
69-
1.14.6
69+
1.17.2

.travis.yml

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: cpp
22
sudo: false
3-
dist: trusty
3+
dist: xenial
44
ruby: 2.2.0
55
notifications:
66
slack:
@@ -26,84 +26,79 @@ matrix:
2626
addons:
2727
apt:
2828
packages:
29-
- cmake3
30-
- cmake3-data
3129
- clang
3230
- clang-format-3.9
3331
- gfortran
3432
- libboost-math-dev
33+
- python3
34+
- python3-pip
3535
env:
3636
- CXX_COMPILER='clang++'
3737
- C_COMPILER='clang'
3838
- Fortran_COMPILER='gfortran'
3939
- BUILD_TYPE='release'
40-
- PYTHON='--three'
4140
- RUN_DANGER=true
4241
- os: linux
4342
addons:
4443
apt:
4544
packages:
46-
- cmake3
47-
- cmake3-data
48-
- g++
49-
- gcc
50-
- gfortran
45+
- g++-4.8
46+
- gcc-4.8
47+
- gfortran-4.8
5148
- libboost-math-dev
49+
- python3
50+
- python3-pip
5251
env:
53-
- CXX_COMPILER='g++'
54-
- C_COMPILER='gcc'
55-
- Fortran_COMPILER='gfortran'
52+
- CXX_COMPILER='g++-4.8'
53+
- C_COMPILER='gcc-4.8'
54+
- Fortran_COMPILER='gfortran-4.8'
5655
- BUILD_TYPE='release'
57-
- PYTHON='--two'
5856
- RUN_DANGER=false
5957
- os: linux
6058
addons:
6159
apt:
6260
sources:
6361
- ubuntu-toolchain-r-test
6462
packages:
65-
- cmake3
66-
- cmake3-data
6763
- g++-6
6864
- gcc-6
6965
- gfortran-6
7066
- libboost-math-dev
67+
- python3
68+
- python3-pip
7169
env:
7270
- CXX_COMPILER='g++-6'
7371
- C_COMPILER='gcc-6'
7472
- Fortran_COMPILER='gfortran-6'
7573
- BUILD_TYPE='release'
76-
- PYTHON='--two'
7774
- STATIC='--static'
7875
- RUN_DANGER=false
7976
- os: linux
8077
addons:
8178
apt:
8279
packages:
83-
- cmake3
84-
- cmake3-data
8580
- g++
8681
- gcc
8782
- gfortran
8883
- libboost-math-dev
8984
- lcov
85+
- python3
86+
- python3-pip
9087
env:
9188
- CXX_COMPILER='g++'
9289
- C_COMPILER='gcc'
9390
- Fortran_COMPILER='gfortran'
9491
- BUILD_TYPE='debug'
95-
- PYTHON='--two'
9692
- COVERAGE='--coverage'
9793
- RUN_DANGER=false
9894
before_install:
9995
- test -n $CC && unset CC
10096
- test -n $CXX && unset CXX
10197
- test -n $FC && unset FC
10298
install:
103-
- pip install --user pipenv --upgrade
104-
- pipenv $PYTHON install
99+
- pip3 install --user pipenv --upgrade
100+
- pipenv --python $(type -P python3) install --dev
105101
before_script:
106-
- source $(pipenv --venv)/bin/activate
107102
- ./.ci/report_versions.sh
108103
- cd $TRAVIS_BUILD_DIR
109104
- echo 'Build set up summary'
@@ -117,7 +112,7 @@ script:
117112
BUNDLE_GEMFILE=.ci/Gemfile bundle exec danger --dangerfile=.ci/Dangerfile --verbose
118113
fi
119114
- |
120-
python setup.py --cxx=$CXX_COMPILER \
115+
pipenv run python setup.py --cxx=$CXX_COMPILER \
121116
--cc=$C_COMPILER \
122117
--fc=$Fortran_COMPILER \
123118
--type=$BUILD_TYPE \
@@ -126,8 +121,8 @@ script:
126121
--prefix=$HOME/Software/pcmsolver
127122
- cd build
128123
- ../.ci/ci_build.sh
129-
- travis_wait 40 python ../.ci/ci_test.py ctest --output-on-failure --verbose --parallel 2
130-
- python ../.ci/ci_print_failing.py
124+
- travis_wait 40 pipenv run python ../.ci/ci_test.py ctest --output-on-failure --verbose --parallel 2
125+
- pipenv run python ../.ci/ci_print_failing.py
131126
after_success:
132127
- |
133128
if [[ "$COVERAGE" = "--coverage" ]]; then

Pipfile.lock

Lines changed: 36 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/PCMInput.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* PCMSolver, an API for the Polarizable Continuum Model
3-
* Copyright (C) 2018 Roberto Di Remigio, Luca Frediani and contributors.
3+
* Copyright (C) 2019 Roberto Di Remigio, Luca Frediani and contributors.
44
*
55
* This file is part of PCMSolver.
66
*

api/pcmsolver.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
!
22
! PCMSolver, an API for the Polarizable Continuum Model
3-
! Copyright (C) 2018 Roberto Di Remigio, Luca Frediani and contributors.
3+
! Copyright (C) 2019 Roberto Di Remigio, Luca Frediani and contributors.
44
!
55
! This file is part of PCMSolver.
66
!

api/pcmsolver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* PCMSolver, an API for the Polarizable Continuum Model
3-
* Copyright (C) 2018 Roberto Di Remigio, Luca Frediani and contributors.
3+
* Copyright (C) 2019 Roberto Di Remigio, Luca Frediani and contributors.
44
*
55
* This file is part of PCMSolver.
66
*

doc/cloc_tools/cloc_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# PCMSolver, an API for the Polarizable Continuum Model
3-
# Copyright (C) 2018 Roberto Di Remigio, Luca Frediani and contributors.
3+
# Copyright (C) 2019 Roberto Di Remigio, Luca Frediani and contributors.
44
#
55
# This file is part of PCMSolver.
66
#

doc/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#
22
# PCMSolver, an API for the Polarizable Continuum Model
3-
# Copyright (C) 2018 Roberto Di Remigio, Luca Frediani and contributors.
3+
# Copyright (C) 2019 Roberto Di Remigio, Luca Frediani and contributors.
44
#
55
# This file is part of PCMSolver.
66
#

0 commit comments

Comments
 (0)