Skip to content

Commit

Permalink
Merge pull request #1974 from Azure/master
Browse files Browse the repository at this point in the history
Merge master into stable for release 2.0.0
  • Loading branch information
timotheeguerin authored Mar 19, 2019
2 parents ce7d63a + 04fe9f2 commit edc65b6
Show file tree
Hide file tree
Showing 1,052 changed files with 21,472 additions and 12,148 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules/
build/
dll/
typings/
logs/
*.log*
*.mem.csv
release/
Expand Down
8 changes: 8 additions & 0 deletions .style.yapf
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[style]
based_on_style=google
spaces_before_comment=4
split_before_logical_operator=True
indent_width=4
column_limit=120
split_arguments_when_comma_terminated=True
blank_line_before_nested_class_or_def=False
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"recommendations": [
"eg2.tslint",
"ms-vscode.vscode-typescript-tslint-plugin",
"shinnn.stylelint",
"EditorConfig.EditorConfig",
"msjsdiag.debugger-for-chrome"
Expand Down
8 changes: 4 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"python.autoComplete.extraPaths": [
"${workspaceRoot}/python"
],
"tslint.jsEnable": true,
"tslint.autoFixOnSave": true,
"vsicons.presets.angular": true,
"tslint.alwaysShowRuleFailuresAsWarnings": true,
"css.validate": false,
"scss.validate": false,
"python.formatting.provider": "yapf"
"python.formatting.provider": "yapf",
"editor.codeActionsOnSave": {
"source.fixAll.tslint": true
}
}
6 changes: 1 addition & 5 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@
},
{
"type": "npm",
"script": "tslint",
"problemMatcher": {
"base": "$tslint5",
"fileLocation": "absolute"
}
"script": "tslint"
}
]
}
3 changes: 3 additions & 0 deletions .vsts/darwin/darwin-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ steps:
npm config list
npm install -g npm@latest
npm --version
npm install -g node-gyp node-pre-gyp
npm i --save-dev [email protected]
npm install
pip install --upgrade pip
pip install -r python/requirements.txt
displayName: Install dependencies
4 changes: 4 additions & 0 deletions .vsts/darwin/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ steps:
npm run -s build:prod
npm run -s build-python
npm run -s package darwin-app
cd ./release/mac
zip -y -r ../BatchExplorer-mac.zip ./BatchExplorer.app
cd ../..
rm -rf ./release/mac/*.app
mkdir ./release/keep
cp ./release/*.zip ./release/keep/before-code-sign.zip
Expand All @@ -12,6 +15,7 @@ steps:
- template: ./sign.yml
- script: |
unzip ./release/BatchExplorer*.zip -d ./release/mac
ls ./release/mac
rm -f ./release/mac/*.pkg
# rm -rf ./release/*.zip
mv ./release/*.zip ./release/code-sign-results.zip
Expand Down
2 changes: 1 addition & 1 deletion .vsts/darwin/sign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ steps:
inputs:
ConnectedServiceName: 'ESRP CodeSign'
FolderPath: ./release
Pattern: 'BatchExplorer-*-mac.zip'
Pattern: 'BatchExplorer-mac.zip'
signConfigType: inlineSignParams
inlineOperation: |
[
Expand Down
2 changes: 1 addition & 1 deletion .vsts/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ steps:

- task: NodeTool@0
inputs:
versionSpec: '10.14.x'
versionSpec: '10.11.x'
1 change: 1 addition & 0 deletions .vsts/win/win-dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@ steps:
node --version
exec { npm i -g npm }
exec { npm install }
exec { python -m pip install --upgrade pip }
exec { pip install -r python/requirements.txt }
displayName: Install dependencies
47 changes: 47 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,50 @@
# 2.0.0
[All items](https://github.com/Azure/BatchExplorer/milestone/32?closed=1)

### feature:


### bug:


### other:

* CTRL+Click not selecting quick-list items [\#1970](https://github.com/Azure/BatchExplorer/issues/1970)
* In the "Jobs" view, the default job sorting should be by creation date, not name [\#1966](https://github.com/Azure/BatchExplorer/issues/1966)
* Subscription list should be sorted [\#1963](https://github.com/Azure/BatchExplorer/issues/1963)
* Dashboard app package table has URL not name [\#1957](https://github.com/Azure/BatchExplorer/issues/1957)
* Local template open in default editor should not open a copy [\#1944](https://github.com/Azure/BatchExplorer/issues/1944)
* Local Template library show full path to file [\#1943](https://github.com/Azure/BatchExplorer/issues/1943)
* Daily cost graph showing corrupt data [\#1933](https://github.com/Azure/BatchExplorer/issues/1933)
* Cant view images from task outputs [\#1928](https://github.com/Azure/BatchExplorer/issues/1928)
* Bugs in Application Packages [\#1926](https://github.com/Azure/BatchExplorer/issues/1926)
* Insider build unable to download (stable) update [\#1919](https://github.com/Azure/BatchExplorer/issues/1919)
* CSS for favorite picker is broken [\#1914](https://github.com/Azure/BatchExplorer/issues/1914)
* Issue with switching azure environment(National cloud) [\#1909](https://github.com/Azure/BatchExplorer/issues/1909)
* Pool quota out of sync with pool list [\#1906](https://github.com/Azure/BatchExplorer/issues/1906)
* Create batch account location picker use provider specific locations [\#1902](https://github.com/Azure/BatchExplorer/issues/1902)
* Add common environment settings support for job [\#1896](https://github.com/Azure/BatchExplorer/issues/1896)
* Local template library only shows .template.json files [\#1894](https://github.com/Azure/BatchExplorer/issues/1894)
* Update to new management api version [\#1892](https://github.com/Azure/BatchExplorer/issues/1892)
* Support setting data disk for batch pools [\#1887](https://github.com/Azure/BatchExplorer/issues/1887)
* Ability to abort the resize of a pool [\#1884](https://github.com/Azure/BatchExplorer/issues/1884)
* Add back option to run a single template without adding a local library folder [\#1883](https://github.com/Azure/BatchExplorer/issues/1883)
* New settings UI [\#1881](https://github.com/Azure/BatchExplorer/issues/1881)
* Add column keyboard navigation for tables for accessibility [\#1878](https://github.com/Azure/BatchExplorer/issues/1878)
* Windows user account interactive mode [\#1868](https://github.com/Azure/BatchExplorer/issues/1868)
* Unify filesystem interfaces [\#1866](https://github.com/Azure/BatchExplorer/issues/1866)
* Switch from bunyan to winston for logging [\#1865](https://github.com/Azure/BatchExplorer/issues/1865)
* New user configuration/settings system [\#1841](https://github.com/Azure/BatchExplorer/issues/1841)
* Support the new type of resource files(Storage container) [\#1839](https://github.com/Azure/BatchExplorer/issues/1839)
* Update Batch api to latest version 2018-12-01.8.0 [\#1838](https://github.com/Azure/BatchExplorer/issues/1838)
* Global app utc vs local time selector [\#1837](https://github.com/Azure/BatchExplorer/issues/1837)
* Switch account monitoring to average now that value are correct [\#1835](https://github.com/Azure/BatchExplorer/issues/1835)
* Migrate from momentjs to luxon [\#1833](https://github.com/Azure/BatchExplorer/issues/1833)
* File group creation disabled if no batch account selected [\#1750](https://github.com/Azure/BatchExplorer/issues/1750)
* Display multi instance settings on the sub task [\#1554](https://github.com/Azure/BatchExplorer/issues/1554)
* Stale pool statistics / graphs [\#1505](https://github.com/Azure/BatchExplorer/issues/1505)
* Batch account favourites should be user specific. [\#250](https://github.com/Azure/BatchExplorer/issues/250)


# 0.19.2

Expand Down
52 changes: 4 additions & 48 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,63 +1,18 @@
# BatchExplorer
[![VSTS Build Status](https://dev.azure.com/azurebatch/BatchExplorer/_apis/build/status/BatchExplorer%20-%20CI)](https://dev.azure.com/azurebatch/BatchExplorer/_build/latest?definitionId=8)
[![Build Status](https://travis-ci.org/Azure/BatchExplorer.svg?branch=master)](https://travis-ci.org/Azure/BatchExplorer)
[![codecov](https://codecov.io/gh/Azure/BatchExplorer/branch/master/graph/badge.svg)](https://codecov.io/gh/Azure/BatchExplorer)

**Note: BatchExplorer is in preview.**

Batch Explorer is a tool to manage your Azure Batch accounts. The goal is to implement a great user experience that will help you debug, monitor and manage your pools, jobs and tasks.
It will also include experimental features such as `Batch Templates` in the aim to improve your Batch experience. We are open to any feedback, ideas and contributions you might have.

BatchExplorer is updated monthly with new features and bug fixes. You can download it for Windows, macOS, and Linux on [Batch Explorer website](https://azure.github.io/BatchExplorer/).

![](docs/images/job-home.png)
![Account view](docs/images/account-home.png)
![Job view](docs/images/job-home.png)

## Downloads

You can download the latest version at https://github.com/Azure/BatchExplorer/releases

## Building BatchExplorer yourself
#### 1. Prerequisites
- **Install node.js version `8` or greater. [Download](https://nodejs.org/en/download/)**
- Install python **3.6** (doesn't need to be in the path if that breaks your environment)

#### 2. Clone the repo
- At stable branch `git clone -b stable https://github.com/Azure/BatchExplorer`
- Or for the latest changes `git clone https://github.com/Azure/BatchExplorer`

Move to the directory `cd BatchExplorer`

#### 3. Build the app with all in one command line(Windows only)
Call this command and it will check you have everything setup correctly and build the app.
```
.\scripts\install\install-windows
```
**You can skip all the other steps**

#### 4. Install the dependencies
```bash
npm install
pip3 install -r python/requirements.txt # or pip if on windows or only have python 3.6 installed
```

#### 4.5 Setup some configuration(Only in certain case)
If you didn't installed python in the path you will need to let BatchExplorer know where it is.
Set an environment variable called `BL_PYTHON_PATH` with that path to the python executable.
BatchExplorer will look first to see if this environment variable is set if not try `python3` and then `python` to find an installation of python 3.6

#### 5. Build and run the application
```bash
# Make an executable, this will bundle all needed dependencies including node and python
npm run build-and-pack

# Manual
npm run build:prod
npm run electron:prod

# To debug errors
npm run build
npm run electron
```
To build Batch Explorer yourself see this [wiki](https://github.com/Azure/BatchExplorer/wiki)

## Feedback
* Request a new feature on [GitHub](https://github.com/Azure/BatchExplorer/issues)
Expand All @@ -78,4 +33,5 @@ Please go see [How to disable crash reporting and telemetry](https://github.com/
Copyright (c) Microsoft Corporation. All rights reserved.

Batch Explorer is licensed under MIT [See license](LICENSE)

Some icons are under Creative Commons Attribution-ShareAlike 3.0 Unported [See license](app/assets/images/logos/LICENSE)
Loading

0 comments on commit edc65b6

Please sign in to comment.