Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/plots/cartesian/axes.js
Original file line number Diff line number Diff line change
Expand Up @@ -1705,7 +1705,7 @@ axes.doTicks = function(gd, axid, skipTitle) {
labelShift = ax.ticklen * Math.sin(caRad);
}

if(ax.ticks === 'outside' || ax.showline) {
if(ax.showticklabels && (ax.ticks === 'outside' || ax.showline)) {
labelStandoff += 0.2 * ax.tickfont.size;
}

Expand Down
6 changes: 4 additions & 2 deletions tasks/util/container_commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,11 +59,13 @@ function getRunCI(commands) {
commands = ['export CIRCLECI=1', containerCommands.cdHome].concat(commands);

var commandsJoined = '"' + commands.join(' && ') + '"';
var containerId = '$(docker inspect --format \'{{.Id}}\' ' + constants.testContainerName + ')';

return [
'sudo',
'lxc-attach -n',
'$(docker inspect --format \'{{.Id}}\' ' + constants.testContainerName + ')',
'lxc-attach',
'-n', containerId,
'-f', '/var/lib/docker/containers/' + containerId + '/config.lxc',
Copy link
Contributor Author

@etpinard etpinard Jul 25, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔈 Big shoutout to hasimo on the CircleCI forums:

https://discuss.circleci.com/t/container-is-not-defined-on-lxc-attach/14684/5

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥇 🎺 lets get back in business!

'-- bash -c',
commandsJoined
].join(' ');
Expand Down
Binary file added test/image/baselines/axes_line_noticklabels.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions test/image/mocks/axes_line_noticklabels.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"data": [{
"x": [0, 1, 2, 3, 4, 5, 6, 7, 8],
"y": [0, 1, 2, 3, 4, 5, 6, 7, 8]
}],
"layout": {
"xaxis": {
"title": "x axis line w/o tick labels",
"showline": true,
"showticklabels": false
},
"yaxis": {
"title": "y axis line w/o tick labels",
"showline": true,
"showticklabels": false
}
}
}