Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed references to old env file. Closes #1520 #1521

Merged
merged 2 commits into from
Mar 16, 2020
Merged

Removed references to old env file. Closes #1520 #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d631f9f
Removed references to old env file. Closes #1520
brollb Mar 16, 2020
e01809c
remove env variable
brollb Mar 16, 2020
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
10 changes: 3 additions & 7 deletions bin/deepforge
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#!/usr/bin/env node
const yaml = require('js-yaml'),
os = require('os'),
const os = require('os'),
IS_WINDOWS = os.type() === 'WINDOWS_NT',
SHELL = IS_WINDOWS ? true : '/bin/bash',
HOME_DIR = os.homedir(),
Expand Down Expand Up @@ -35,10 +34,7 @@ var Command = require('commander').Command,
return dir;
};

const ENV_FILE = path.join(__dirname, '..', 'environment.yml'),
DEEPFORGE_CONDA_ENV =
yaml.safeLoad(fs.readFileSync(ENV_FILE)).name || process.env.DEEPFORGE_CONDA_ENV;

const DEEPFORGE_CONDA_ENV = 'deepforge';
const getDeepForgeServerCommand = function(useConda){
if(useConda){
return `${IS_WINDOWS ? 'conda': 'source'} activate ${DEEPFORGE_CONDA_ENV} && node`;
Expand Down Expand Up @@ -417,4 +413,4 @@ module.exports.SHELL = SHELL;

if (require.main === module) {
program.parse(process.argv);
}
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"start": "node ./bin/deepforge start",
"postinstall": "node utils/reinstall-extensions.js && node utils/build-job-utils.js && node utils/conda-utils.js",
"postinstall": "node utils/reinstall-extensions.js && node utils/build-job-utils.js",
"start-dev": "NODE_ENV=dev node ./bin/deepforge start",
"start-authenticated": "NODE_ENV=production ./bin/deepforge start",
"server": "node ./bin/deepforge start --server",
Expand Down
14 changes: 2 additions & 12 deletions utils/conda-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ const {spawnSync, spawn} = require('child_process'),
fs = require('fs'),
yaml = require('js-yaml'),
CONDA_COMMAND = 'conda',
SHELL = os.type() === 'Windows_NT' ? true: '/bin/bash',
ENV_FILE = path.join(__dirname, '..', 'environment.yml');
SHELL = os.type() === 'Windows_NT' ? true: '/bin/bash';

const getCondaEnvs = function () {
const envProcess = spawnSyncCondaProcess(['env', 'list']);
Expand Down Expand Up @@ -76,15 +75,6 @@ const spawnSyncCondaProcess = function (args) {
});
};

const runMain = function () {
checkConda();
createOrUpdateEnvironment(ENV_FILE);
};

const CondaManager = {checkConda, createOrUpdateEnvironment};

if (require.main === module) {
runMain();
}

module.exports = CondaManager;
module.exports = CondaManager;