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

backport fixes from master #77

Merged
merged 51 commits into from
Sep 28, 2017
Merged

backport fixes from master #77

merged 51 commits into from
Sep 28, 2017

Conversation

jhoblitt
Copy link
Member

No description provided.

@jhoblitt
completely remove osx from travis matrix
3773a33 
In hopes that this will improve travis build scheduling times.
@jhoblitt
Merge pull request #69 from lsst/tickets/DM-11928-travis-osx
aecd030 
completely remove osx from travis matrix
@jhoblitt
add .rspec defaults file
26f1e8f
@jhoblitt
add rubocop gem
3061131
@jhoblitt
check stdout/stderr in all specs
cf3428f
@jhoblitt
DRY up spec function names
679cf4b
@jhoblitt
fix rubocop warnings
b7ec66e
@jhoblitt
add rubocop to travis
f0e6ec9
@jhoblitt
namespacify n8l::trim()
e70f328
@jhoblitt
namespacify n8l::print_error()
fee624c
@jhoblitt
namespacify n8l::fail()
bedc418
@jhoblitt
namespacify n8l::ln_rel()
3cfc9cd
@jhoblitt
namespacify n8l::usage()
d8e81fe
@jhoblitt
namespacify n8l::miniconda_slug()
48b1a86
@jhoblitt
namespacify n8l::python_env_slug()
20a9f3b
@jhoblitt
namespacify n8l::eups_slug()
b730126
@jhoblitt
namespacify n8l::eups_base_dir()
4420234
@jhoblitt
namespacify n8l::eups_dir()
4640119
@jhoblitt
namespacify n8l::eups_path()
e039954
@jhoblitt
namespacify n8l::sys::osfamily()
0b23c86
@jhoblitt
namespacify n8l::sys::platform()
918ec7c
@jhoblitt
namespacify n8l::join()
45ccc32
@jhoblitt
namespacify n8l::default_eups_pkgroot()
28141bd
@jhoblitt
namespacify n8l::config_curl()
0d6f862
@jhoblitt
namespacify n8l::miniconda::install()
47acc02
@jhoblitt
namespacify n8l::miniconda::config_channels()
bb7bf12
@jhoblitt
namespacify n8l::miniconda::lsst_env()
903f86e
@jhoblitt
namespacify n8l::up2date_check()
1e50531
@jhoblitt
namespacify n8l::git_check()
2ce79f8
@jhoblitt
namespacify n8l::bootstrap_miniconda()
bd28f34
@jhoblitt jhoblitt force-pushed the tickets/DM-12034-backport-14.0 branch 2 times, most recently from e35340c to d3106dd Compare September 28, 2017 00:35
@jhoblitt
do not preserve EUPS_PKGROOT by default
d49d5a8 
in the loadLSST.* scripts.  A `-p` cli option is added to enable the
previous behavior of preserving EUPS_PKGROOT.
@jhoblitt
remove usage of eval for indirect variable assignment
33cc8ae 
Replaced with declare.
@jhoblitt
add warning for known problematic env vars
3005d1c
@jhoblitt
rename bootstrap_miniconda() -> miniconda::boostrap()
b5f2f4d 
Preparation to mostly decouple this function from global vars.
@jhoblitt
pass config to miniconda::boostrap() via function params
4899e86 
instead of by global vars. Ie., partially decoupling the function
@jhoblitt
decouple miniconda::bootstrap() & n8l::generate_loader_*()
5f36850
@jhoblitt
Revert "remove usage of eval for indirect variable assignment"
c394258 
This reverts commit d3bb206.
@jhoblitt
bash 3.2 does not support declare -g
0629275
@jhoblitt
add ancient bash (3.2) to travis matrix
11ac4b5
@jhoblitt
do not try to add miniconda to path when its not in use
65f96ff
@jhoblitt
add eups distrib install sanity check
760356d
@jhoblitt
fix n8l::create_load_scripts() calling params
bdb6a36 
The number of parameters and the position order were changed in #74.
@jhoblitt
add 1[234].0 release branches to travis whitelist
5c52972
@jhoblitt jhoblitt force-pushed the tickets/DM-12034-backport-14.0 branch from d3106dd to 5c52972 Compare September 28, 2017 00:40
@jhoblitt jhoblitt requested a review from timj September 28, 2017 00:41
@jhoblitt
Copy link
Member Author

This brings the v14.0 branch up to sync with master except for the exclusion of #68 .

timj
timj approved these changes Sep 28, 2017
View reviewed changes
Copy link
Member

@timj timj left a comment

Choose a reason for hiding this comment

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

Since master works and since the versions at the top of newinstall have not changed on this PR I'm going to assume it's ok.

@jhoblitt jhoblitt merged commit 4042cae into 14.0 Sep 28, 2017
@jhoblitt jhoblitt deleted the tickets/DM-12034-backport-14.0 branch August 28, 2018 22:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timj timj timj approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jhoblitt @timj