Skip to content

Commit a1a60d7

Browse files
authored
Merge pull request #191 from man-group/drop-old-python-support
Drop old python support and fix testing install dependencies
2 parents 167891a + 0c42930 commit a1a60d7

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

.circleci/config.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test-tmpl: &test-tmpl
88
99
job-tmpl: &job-tmpl
1010
machine:
11-
image: ubuntu-1604:201903-01
11+
image: ubuntu-2004:202010-01
1212

1313
working_directory: ~/src
1414

@@ -132,11 +132,6 @@ job-tmpl: &job-tmpl
132132

133133
version: 2
134134
jobs:
135-
py27:
136-
<<: *job-tmpl
137-
environment:
138-
PYTHON: "python2.7"
139-
140135
py35:
141136
<<: *job-tmpl
142137
environment:
@@ -169,13 +164,9 @@ workflows:
169164
version: 2
170165
pytest-plugins:
171166
jobs:
172-
- py27
173-
- py35
174167
- py36
175168
- py37
176169
- coveralls:
177170
requires:
178-
- py27
179-
- py35
180171
- py36
181172
- py37

install.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,16 @@ function init_venv {
9696

9797

9898
function update_apt_sources {
99-
wget -qO- https://download.rethinkdb.com/apt/pubkey.gpg | apt-key add -
100-
. /etc/lsb-release && echo "deb http://download.rethinkdb.com/apt $DISTRIB_CODENAME main" | tee /etc/apt/sources.list.d/rethinkdb.list
99+
wget -qO- https://download.rethinkdb.com/repository/raw/pubkey.gpg | apt-key add -
100+
. /etc/lsb-release && echo "deb https://download.rethinkdb.com/repository/ubuntu-$DISTRIB_CODENAME $DISTRIB_CODENAME main" | tee /etc/apt/sources.list.d/rethinkdb.list
101101

102-
wget -q -O - https://pkg.jenkins.io/debian/jenkins-ci.org.key | apt-key add -
102+
wget -q -O - https://pkg.jenkins.io/debian-stable/jenkins.io.key | apt-key add -
103103
sh -c 'echo deb http://pkg.jenkins.io/debian-stable binary/ > /etc/apt/sources.list.d/jenkins.list'
104104

105105
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
106106
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.4.list
107107

108+
apt install ca-certificates
108109
apt-get update
109110
}
110111

@@ -137,7 +138,7 @@ function install_jenkins {
137138
}
138139

139140
function install_mongodb {
140-
apt-get install -y mongodb-org mongodb-org-server
141+
apt-get install -y mongodb mongodb-server
141142
}
142143

143144
function install_apache {

0 commit comments

Comments
 (0)