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.

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

Pull Request For #110: yaml.load(input) deprecated #113

Merged
merged 2 commits into from
Jan 30, 2020
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
4 changes: 2 additions & 2 deletions analysis/release/descriptive/plot.eps

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions analysis/release/descriptive/sconscript_descriptive.log
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
*** Builder log created: {2018-02-14 21:21:56}
*** Builder log completed: {2018-02-14 21:21:58}
*** Builder log created: {2020-01-29 21:07:57}
*** Builder log completed: {2020-01-29 21:08:02}
17 changes: 14 additions & 3 deletions analysis/release/sconstruct.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
*** New build: {2018-03-02 10:12:12} ***
*** New build: {2020-01-29 21:07:56} ***
scons: done reading SConscript files.
scons: Building targets ...
build_python(["build/prepare_data/data.txt"], ["source/prepare_data/create_data.py"])
scons: `release' is up to date.
build_python(["build/descriptive/plot.eps", "build/descriptive/table.txt"], ["source/descriptive/descriptive.py", "build/prepare_data/data.txt"])
Install directory: "build/descriptive" as "release/descriptive"
Install file: "build/prepare_data/data.txt" as "release/lg/data.txt"
scons: done building targets.
*** Build completed: {2018-03-02 10:12:12} ***
*** Build completed: {2020-01-29 21:08:02} ***


./release/descriptive/sconscript_descriptive.log
*** Builder log created: {2020-01-29 21:07:57}
*** Builder log completed: {2020-01-29 21:08:02}
./build/descriptive/sconscript_descriptive.log
*** Builder log created: {2020-01-29 21:07:57}
*** Builder log completed: {2020-01-29 21:08:02}
./build/prepare_data/sconscript_create_data.log
*** Builder log created: {2020-01-29 21:07:56}
*** Builder log completed: {2020-01-29 21:07:57}
140 changes: 69 additions & 71 deletions analysis/release/state_of_repo.log
Original file line number Diff line number Diff line change
Expand Up @@ -8,98 +8,96 @@ as it can be edited after state_of_repo.log finishes running
===================================
Last commit:

commit 2c30ad8bb276736db4d645000f715810767e2a33
Author: Adam Rosenberg <[email protected]>
Date: Thu Feb 15 10:43:55 2018 -0800
commit b02e51d5a0b9c1090cda24367c2d68c7f4fb131b
Author: David Ritzwoller <[email protected]>
Date: Wed Jan 29 21:06:58 2020 -0800

#96 drop _ before anything builder
#110 add Loader


Files changed since last commit:


README.md
analysis/release/descriptive/plot.eps
analysis/release/descriptive/sconscript_descriptive.log

===================================

*** FILE STATUS ***

===================================
./config_global.yaml:
modified on: 02 Mar 2018 10:03:34
size of file: 1264
./config_user.yaml:
modified on: 14 Feb 2018 21:21:10
size of file: 619
modified on: 29 Jan 2020 21:07:56
size of file: 646
./run.py:
modified on: 12 Feb 2018 13:11:33
size of file: 458
modified on: 23 Aug 2019 16:10:40
size of file: 449
./state_of_repo.log:
modified on: 29 Jan 2020 21:08:02
size of file: 525
./SConstruct:
modified on: 02 Mar 2018 10:11:38
modified on: 23 Aug 2019 16:10:40
size of file: 1878
./config_global.yaml:
modified on: 23 Aug 2019 16:10:40
size of file: 1264
./sconstruct.log:
modified on: 02 Mar 2018 10:12:12
size of file: 255
./state_of_repo.log:
modified on: 02 Mar 2018 10:12:12
size of file: 453
./build/descriptive/plot.eps:
modified on: 02 Mar 2018 09:46:49
size of file: 12351
./build/descriptive/sconscript_descriptive.log:
modified on: 02 Mar 2018 09:46:49
size of file: 96
./build/descriptive/table.txt:
modified on: 02 Mar 2018 09:46:49
size of file: 39
./build/prepare_data/data.txt:
modified on: 02 Mar 2018 10:12:12
size of file: 1988897
./build/prepare_data/sconscript_create_data.log:
modified on: 02 Mar 2018 10:12:12
size of file: 96
./release/create_data.log:
modified on: 02 Mar 2018 10:02:13
size of file: 1498
./release/sconstruct.log:
modified on: 02 Mar 2018 10:10:51
size of file: 841
modified on: 29 Jan 2020 21:08:02
size of file: 502
./source/prepare_data/create_data.m:
modified on: 23 Aug 2019 16:10:40
size of file: 202
./source/prepare_data/create_data.sh:
modified on: 23 Aug 2019 16:10:40
size of file: 81
./source/prepare_data/create_data.do:
modified on: 23 Aug 2019 16:10:40
size of file: 262
./source/prepare_data/SConscript:
modified on: 23 Aug 2019 16:10:40
size of file: 1126
./source/prepare_data/create_data.py:
modified on: 23 Aug 2019 16:10:40
size of file: 260
./source/prepare_data/create_data.r:
modified on: 23 Aug 2019 16:10:40
size of file: 249
./source/descriptive/descriptive.py:
modified on: 23 Aug 2019 16:10:40
size of file: 548
./source/descriptive/SConscript:
modified on: 23 Aug 2019 16:10:40
size of file: 501
./release/state_of_repo.log:
modified on: 02 Mar 2018 10:10:51
size of file: 3673
./release/descriptive/plot.eps:
modified on: 02 Mar 2018 10:10:51
size of file: 12351
modified on: 23 Aug 2019 16:10:40
size of file: 2874
./release/sconstruct.log:
modified on: 23 Aug 2019 16:10:40
size of file: 306
./release/descriptive/sconscript_descriptive.log:
modified on: 02 Mar 2018 10:10:51
modified on: 29 Jan 2020 21:08:02
size of file: 96
./release/descriptive/plot.eps:
modified on: 29 Jan 2020 21:08:02
size of file: 12351
./release/descriptive/table.txt:
modified on: 02 Mar 2018 09:46:49
modified on: 29 Jan 2020 21:08:01
size of file: 39
./release/lg/data.txt:
modified on: 02 Mar 2018 09:46:45
modified on: 29 Jan 2020 21:07:57
size of file: 1988897
./source/descriptive/descriptive.py:
modified on: 12 Feb 2018 10:17:21
size of file: 548
./source/descriptive/SConscript:
modified on: 12 Feb 2018 10:16:38
size of file: 501
./source/prepare_data/create_data.do:
modified on: 09 Jan 2018 08:11:40
size of file: 262
./source/prepare_data/create_data.m:
modified on: 12 Feb 2018 10:17:58
size of file: 202
./source/prepare_data/create_data.py:
modified on: 14 Feb 2018 21:21:44
size of file: 260
./source/prepare_data/create_data.r:
modified on: 12 Feb 2018 10:19:10
size of file: 249
./source/prepare_data/create_data.sh:
modified on: 09 Jan 2018 08:11:40
size of file: 81
./source/prepare_data/SConscript:
modified on: 02 Mar 2018 10:12:04
size of file: 1126
./build/prepare_data/sconscript_create_data.log:
modified on: 29 Jan 2020 21:07:57
size of file: 96
./build/prepare_data/data.txt:
modified on: 29 Jan 2020 21:07:57
size of file: 1988897
./build/descriptive/sconscript_descriptive.log:
modified on: 29 Jan 2020 21:08:02
size of file: 96
./build/descriptive/plot.eps:
modified on: 29 Jan 2020 21:08:02
size of file: 12351
./build/descriptive/table.txt:
modified on: 29 Jan 2020 21:08:01
size of file: 39
2 changes: 1 addition & 1 deletion config/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def configuration(ARGUMENTS, paper = False, config_user_yaml = 'config_user.yaml
# Loads config yaml files
CONFIG = {'user': config_user_yaml, 'global': config_global_yaml}
for key, val in CONFIG.items():
CONFIG[key] = yaml.load(open(val, 'rU'))
CONFIG[key] = yaml.load(open(val, 'rU'), Loader = yaml.FullLoader)
if not CONFIG[key]:
del CONFIG[key]

Expand Down