From 666eb08706e4970bbd75dcd5605ec0022c3e925c Mon Sep 17 00:00:00 2001 From: Benjamin Bay <48391872+ben-bay@users.noreply.github.com> Date: Wed, 20 Nov 2019 15:30:33 -0800 Subject: [PATCH 01/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a3ac276f..49cacf351 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ HPC batch systems, since it can scale to a very large number of jobs. The integrated system looks a little something like this: -a typical Merlin workflow +a typical Merlin workflow In this example, here's how it all works: From f5b873a7a3d32e2ef3abf234a7aa8dea9375b813 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 10:25:50 -0800 Subject: [PATCH 02/19] added tabulate to requirements.txt --- requirements/release.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements/release.txt b/requirements/release.txt index 976c32560..2bdf6b4ec 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -7,6 +7,7 @@ numpy parse psutil>=5.1.0 pyyaml>=5.1.2 +tabulate # Install tip of maestrowf -e git+https://github.com/LLNL/maestrowf.git#egg=maestrowf From 1be0d95a106eef0d1b8cc60c88c17f7939f3a94f Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 10:29:28 -0800 Subject: [PATCH 03/19] added regular pip install of maestrowf (now it works\!) --- requirements/release.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements/release.txt b/requirements/release.txt index 2bdf6b4ec..000024a49 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -3,11 +3,9 @@ celery[redis]>=4.3.0 coloredlogs cryptography importlib_resources; python_version < '3.7' +maestrowf numpy parse psutil>=5.1.0 pyyaml>=5.1.2 tabulate - -# Install tip of maestrowf --e git+https://github.com/LLNL/maestrowf.git#egg=maestrowf From e4a763306df64ab647ae04b7d700f6c89873d800 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 10:41:35 -0800 Subject: [PATCH 04/19] reverted previous maestro change --- requirements/release.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/requirements/release.txt b/requirements/release.txt index 000024a49..2d93fd49f 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -9,3 +9,6 @@ parse psutil>=5.1.0 pyyaml>=5.1.2 tabulate + +# Install tip of maestrowf +-e git+https://github.com/LLNL/maestrowf.git#egg=maestrowf From a8a36495ef28f7379b8ea115860193f3fbe883d4 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 11:01:48 -0800 Subject: [PATCH 05/19] commented out maestrowf 1.1.5 --- requirements/release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/release.txt b/requirements/release.txt index 2d93fd49f..8ca46abc8 100644 --- a/requirements/release.txt +++ b/requirements/release.txt @@ -3,7 +3,7 @@ celery[redis]>=4.3.0 coloredlogs cryptography importlib_resources; python_version < '3.7' -maestrowf +# maestrowf>=1.1.5 numpy parse psutil>=5.1.0 From b6889aaeb90ce170c6ffbb7cc1833b25a3851782 Mon Sep 17 00:00:00 2001 From: "Joseph M. Koning" Date: Wed, 4 Dec 2019 12:53:05 -0800 Subject: [PATCH 06/19] Add requirements to MANIFEST.in for source dist. --- MANIFEST.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MANIFEST.in b/MANIFEST.in index b2f4f33b6..3a1b2a29d 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,3 +2,5 @@ prune docs prune tests include workflows/* include merlin/data/* +include requirements.txt +include requirements/* From 39c9dec4ba50c1c072a6b24d052b341e1eadff61 Mon Sep 17 00:00:00 2001 From: "Joseph M. Koning" Date: Wed, 4 Dec 2019 13:31:20 -0800 Subject: [PATCH 07/19] Add Changelog entry and bump version. --- CHANGELOG.md | 7 +++++++ merlin/__init__.py | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ab9f3a68..2d33290be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to Merlin will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.3] - 2019-12-04 + +### Added +Added the requirements files to the MANIFEST.in file for source +distributions. + + ## [1.0.0] - 2019-11-19 First public release. See the docs and merlin -h for details. Here are some highlights. diff --git a/merlin/__init__.py b/merlin/__init__.py index 073551f80..d19f10764 100644 --- a/merlin/__init__.py +++ b/merlin/__init__.py @@ -38,7 +38,7 @@ import sys -__version__ = "1.0.2" +__version__ = "1.0.3" VERSION = __version__ PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "") From 73fcd719ac477f9ba893c303c469f91fbe8b3a45 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 13:57:15 -0800 Subject: [PATCH 08/19] feature_demo conforms to template layout --- workflows/feature_demo/feature_demo.yaml | 11 ++++++----- workflows/feature_demo/requirements.txt | 1 + workflows/feature_demo/{ => scripts}/collector.py | 0 workflows/feature_demo/{ => scripts}/features.json | 0 workflows/feature_demo/{ => scripts}/hello_world.py | 0 workflows/feature_demo/{ => scripts}/make_samples.py | 0 workflows/feature_demo/{ => scripts}/translator.py | 0 7 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 workflows/feature_demo/requirements.txt rename workflows/feature_demo/{ => scripts}/collector.py (100%) rename workflows/feature_demo/{ => scripts}/features.json (100%) rename workflows/feature_demo/{ => scripts}/hello_world.py (100%) rename workflows/feature_demo/{ => scripts}/make_samples.py (100%) rename workflows/feature_demo/{ => scripts}/translator.py (100%) diff --git a/workflows/feature_demo/feature_demo.yaml b/workflows/feature_demo/feature_demo.yaml index 1377feadd..2447ac08d 100644 --- a/workflows/feature_demo/feature_demo.yaml +++ b/workflows/feature_demo/feature_demo.yaml @@ -12,11 +12,12 @@ env: WORKER_NAME: demo_worker VERIFY_QUEUE: default_verify_queue - HELLO: $(SPECROOT)/hello_world.py - FEATURES: $(SPECROOT)/features.json - TRANSLATE: $(SPECROOT)/translator.py - COLLECT: $(SPECROOT)/collector.py - MAKE_SAMPLES: $(SPECROOT)/make_samples.py + SCRIPTS: $(SPECROOT)/scripts + HELLO: $(SCRIPTS)/hello_world.py + FEATURES: $(SCRIPTS)/features.json + TRANSLATE: $(SCRIPTS)/translator.py + COLLECT: $(SCRIPTS)/collector.py + MAKE_SAMPLES: $(SCRIPTS)/make_samples.py SHARED: $(SPECROOT)/../shared LEARN: $(SHARED)/learn.py diff --git a/workflows/feature_demo/requirements.txt b/workflows/feature_demo/requirements.txt new file mode 100644 index 000000000..0c62c11b4 --- /dev/null +++ b/workflows/feature_demo/requirements.txt @@ -0,0 +1 @@ +sklearn diff --git a/workflows/feature_demo/collector.py b/workflows/feature_demo/scripts/collector.py similarity index 100% rename from workflows/feature_demo/collector.py rename to workflows/feature_demo/scripts/collector.py diff --git a/workflows/feature_demo/features.json b/workflows/feature_demo/scripts/features.json similarity index 100% rename from workflows/feature_demo/features.json rename to workflows/feature_demo/scripts/features.json diff --git a/workflows/feature_demo/hello_world.py b/workflows/feature_demo/scripts/hello_world.py similarity index 100% rename from workflows/feature_demo/hello_world.py rename to workflows/feature_demo/scripts/hello_world.py diff --git a/workflows/feature_demo/make_samples.py b/workflows/feature_demo/scripts/make_samples.py similarity index 100% rename from workflows/feature_demo/make_samples.py rename to workflows/feature_demo/scripts/make_samples.py diff --git a/workflows/feature_demo/translator.py b/workflows/feature_demo/scripts/translator.py similarity index 100% rename from workflows/feature_demo/translator.py rename to workflows/feature_demo/scripts/translator.py From 136f5123bd5f0f3f00548bb760900415608cb2ef Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 14:00:54 -0800 Subject: [PATCH 09/19] flux tests now conform to template layout --- workflows/flux/flux_par.yaml | 4 ++-- workflows/flux/paper.yaml | 6 +++--- workflows/flux/{ => scripts}/flux_info.py | 0 workflows/flux/{ => scripts}/hello.c | 0 workflows/flux/{ => scripts}/hello_sleep.c | 0 workflows/flux/{ => scripts}/make_samples.py | 0 workflows/flux/{ => scripts}/paper_workers.sbatch | 0 workflows/flux/{ => scripts}/test_workers.sbatch | 0 workflows/flux/{ => scripts}/workers.bsub | 0 workflows/flux/{ => scripts}/workers.sbatch | 0 10 files changed, 5 insertions(+), 5 deletions(-) rename workflows/flux/{ => scripts}/flux_info.py (100%) rename workflows/flux/{ => scripts}/hello.c (100%) rename workflows/flux/{ => scripts}/hello_sleep.c (100%) rename workflows/flux/{ => scripts}/make_samples.py (100%) rename workflows/flux/{ => scripts}/paper_workers.sbatch (100%) rename workflows/flux/{ => scripts}/test_workers.sbatch (100%) rename workflows/flux/{ => scripts}/workers.bsub (100%) rename workflows/flux/{ => scripts}/workers.sbatch (100%) diff --git a/workflows/flux/flux_par.yaml b/workflows/flux/flux_par.yaml index 3562e97bc..eda977d2c 100644 --- a/workflows/flux/flux_par.yaml +++ b/workflows/flux/flux_par.yaml @@ -16,7 +16,7 @@ study: - description: Build the code name: build run: - cmd: mpicc -o mpi_hello $(SPECROOT)/hello.c >& build.out + cmd: mpicc -o mpi_hello $(SPECROOT)/scripts/hello.c >& build.out task_queue: flux_par - description: Echo the params name: runs @@ -60,4 +60,4 @@ merlin: column_labels: [V1, V2] file: $(MERLIN_INFO)/samples.npy generate: - cmd: python $(SPECROOT)/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy + cmd: python $(SPECROOT)/scripts/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy diff --git a/workflows/flux/paper.yaml b/workflows/flux/paper.yaml index c7e984c3b..4b554d75a 100644 --- a/workflows/flux/paper.yaml +++ b/workflows/flux/paper.yaml @@ -19,7 +19,7 @@ study: name: build run: cmd: | - mpicc -o mpi_hello_sleep $(SPECROOT)/hello_sleep.c >& build.out + mpicc -o mpi_hello_sleep $(SPECROOT)/scripts/hello_sleep.c >& build.out # Add start time to flux flux wreck setenv FLUX_START_TIME=${FLUX_START_TIME} flux wreck setenv FLUX_START_SECONDS=${FLUX_START_SECONDS} @@ -47,7 +47,7 @@ study: run: cmd: | #export PATH=/collab/usr/gapps/merlin/spack/idesign/${SYS_TYPE}/bin:$PATH - $(SPECROOT)/flux_info.py >flux_timings.out + $(SPECROOT)/scripts/flux_info.py >flux_timings.out depends: [runs*] task_queue: flux_paper @@ -68,4 +68,4 @@ merlin: column_labels: [V1, V2] file: $(MERLIN_INFO)/samples.npy generate: - cmd: python $(SPECROOT)/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy + cmd: python $(SPECROOT)/scripts/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy diff --git a/workflows/flux/flux_info.py b/workflows/flux/scripts/flux_info.py similarity index 100% rename from workflows/flux/flux_info.py rename to workflows/flux/scripts/flux_info.py diff --git a/workflows/flux/hello.c b/workflows/flux/scripts/hello.c similarity index 100% rename from workflows/flux/hello.c rename to workflows/flux/scripts/hello.c diff --git a/workflows/flux/hello_sleep.c b/workflows/flux/scripts/hello_sleep.c similarity index 100% rename from workflows/flux/hello_sleep.c rename to workflows/flux/scripts/hello_sleep.c diff --git a/workflows/flux/make_samples.py b/workflows/flux/scripts/make_samples.py similarity index 100% rename from workflows/flux/make_samples.py rename to workflows/flux/scripts/make_samples.py diff --git a/workflows/flux/paper_workers.sbatch b/workflows/flux/scripts/paper_workers.sbatch similarity index 100% rename from workflows/flux/paper_workers.sbatch rename to workflows/flux/scripts/paper_workers.sbatch diff --git a/workflows/flux/test_workers.sbatch b/workflows/flux/scripts/test_workers.sbatch similarity index 100% rename from workflows/flux/test_workers.sbatch rename to workflows/flux/scripts/test_workers.sbatch diff --git a/workflows/flux/workers.bsub b/workflows/flux/scripts/workers.bsub similarity index 100% rename from workflows/flux/workers.bsub rename to workflows/flux/scripts/workers.bsub diff --git a/workflows/flux/workers.sbatch b/workflows/flux/scripts/workers.sbatch similarity index 100% rename from workflows/flux/workers.sbatch rename to workflows/flux/scripts/workers.sbatch From 8d21b4c4562a5637b83b547ad263d9aacfb39037 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 14:02:24 -0800 Subject: [PATCH 10/19] added requirements.txt --- workflows/flux/requirements.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 workflows/flux/requirements.txt diff --git a/workflows/flux/requirements.txt b/workflows/flux/requirements.txt new file mode 100644 index 000000000..53151f56f --- /dev/null +++ b/workflows/flux/requirements.txt @@ -0,0 +1,2 @@ +flux +numpy From 88cecc5e23d435dddda3489fe745c56ba80bf5de Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 14:04:43 -0800 Subject: [PATCH 11/19] slurm workflow now conforms to template layout --- workflows/slurm/requirements.txt | 1 + workflows/slurm/{ => scripts}/hello.c | 0 workflows/slurm/{ => scripts}/make_samples.py | 0 workflows/slurm/{ => scripts}/test_workers.sbatch | 0 workflows/slurm/{ => scripts}/workers.sbatch | 0 workflows/slurm/slurm_par.yaml | 4 ++-- workflows/slurm/slurm_test.yaml | 2 +- 7 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 workflows/slurm/requirements.txt rename workflows/slurm/{ => scripts}/hello.c (100%) rename workflows/slurm/{ => scripts}/make_samples.py (100%) rename workflows/slurm/{ => scripts}/test_workers.sbatch (100%) rename workflows/slurm/{ => scripts}/workers.sbatch (100%) diff --git a/workflows/slurm/requirements.txt b/workflows/slurm/requirements.txt new file mode 100644 index 000000000..24ce15ab7 --- /dev/null +++ b/workflows/slurm/requirements.txt @@ -0,0 +1 @@ +numpy diff --git a/workflows/slurm/hello.c b/workflows/slurm/scripts/hello.c similarity index 100% rename from workflows/slurm/hello.c rename to workflows/slurm/scripts/hello.c diff --git a/workflows/slurm/make_samples.py b/workflows/slurm/scripts/make_samples.py similarity index 100% rename from workflows/slurm/make_samples.py rename to workflows/slurm/scripts/make_samples.py diff --git a/workflows/slurm/test_workers.sbatch b/workflows/slurm/scripts/test_workers.sbatch similarity index 100% rename from workflows/slurm/test_workers.sbatch rename to workflows/slurm/scripts/test_workers.sbatch diff --git a/workflows/slurm/workers.sbatch b/workflows/slurm/scripts/workers.sbatch similarity index 100% rename from workflows/slurm/workers.sbatch rename to workflows/slurm/scripts/workers.sbatch diff --git a/workflows/slurm/slurm_par.yaml b/workflows/slurm/slurm_par.yaml index 720046091..893e1c7a3 100644 --- a/workflows/slurm/slurm_par.yaml +++ b/workflows/slurm/slurm_par.yaml @@ -13,7 +13,7 @@ study: - description: Build the code name: build run: - cmd: mpicc -o mpi_hello $(SPECROOT)/hello.c >& build.out + cmd: mpicc -o mpi_hello $(SPECROOT)/scripts/hello.c >& build.out task_queue: slurm_par - description: Echo the params name: runs @@ -46,4 +46,4 @@ merlin: column_labels: [V1, V2] file: $(MERLIN_INFO)/samples.npy generate: - cmd: python $(SPECROOT)/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy + cmd: python $(SPECROOT)/scripts/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy diff --git a/workflows/slurm/slurm_test.yaml b/workflows/slurm/slurm_test.yaml index 1c783bc6a..dcb5bb598 100644 --- a/workflows/slurm/slurm_test.yaml +++ b/workflows/slurm/slurm_test.yaml @@ -40,4 +40,4 @@ merlin: column_labels: [V1, V2] file: $(MERLIN_INFO)/samples.npy generate: - cmd: python $(SPECROOT)/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy + cmd: python $(SPECROOT)/scripts/make_samples.py -dims 2 -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy From 1b311c15f7dc4409c1dfa9a594c9f4f5b2f5ecae Mon Sep 17 00:00:00 2001 From: Benjamin Bay Date: Wed, 4 Dec 2019 14:12:04 -0800 Subject: [PATCH 12/19] added install of requirements of specific workflow, for testing --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 5d1fb6d56..8a9b9ecfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ install: - "pip install --upgrade pip" - "pip install cryptography" - "pip install -r requirements.txt" + - "pip install -r workflows/feature_demo/requirements.txt" - "pip install -e ." - "pip install -r requirements/mysql.txt" - "pip install --upgrade sphinx" From 92a0d605c6cac1e4dab99b3f934704bd7b16faf0 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 14:23:32 -0800 Subject: [PATCH 13/19] corrected incorrect filepath in yaml spec --- workflows/feature_demo/feature_demo.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/feature_demo/feature_demo.yaml b/workflows/feature_demo/feature_demo.yaml index 2447ac08d..e8e1b0944 100644 --- a/workflows/feature_demo/feature_demo.yaml +++ b/workflows/feature_demo/feature_demo.yaml @@ -138,7 +138,7 @@ merlin: args: -l INFO --concurrency 3 --prefetch-multiplier 1 -Ofair samples: generate: - cmd: python $(SPECROOT)/make_samples.py -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy + cmd: python $(MAKE_SAMPLES) -n $(N_SAMPLES) -outfile=$(MERLIN_INFO)/samples.npy # can be a file glob of numpy sample files. file: $(MERLIN_INFO)/samples.npy column_labels: [X0, X1] From 612870675385045d2038b96d3a13526c9575d7ae Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 15:17:20 -0800 Subject: [PATCH 14/19] updated CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d33290be..cc3c82380 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 Added the requirements files to the MANIFEST.in file for source distributions. +## [1.0.2] - 2019-12-04 +Negligible changes related to PyPI. + +## [1.0.1] - 2019-12-04 +Negligible changes related to PyPI. ## [1.0.0] - 2019-11-19 First public release. See the docs and merlin -h for details. From c2703d831a79b80cc7386106410e425e7f27fe19 Mon Sep 17 00:00:00 2001 From: Bay Date: Wed, 4 Dec 2019 16:09:54 -0800 Subject: [PATCH 15/19] removed flux from requirements.txt --- workflows/flux/requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/workflows/flux/requirements.txt b/workflows/flux/requirements.txt index 53151f56f..24ce15ab7 100644 --- a/workflows/flux/requirements.txt +++ b/workflows/flux/requirements.txt @@ -1,2 +1 @@ -flux numpy From 1950870dbdcbd719e66513c6fd7ba7cc87ba858c Mon Sep 17 00:00:00 2001 From: Benjamin Bay <48391872+ben-bay@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:25:27 -0800 Subject: [PATCH 16/19] Update requirements.txt --- workflows/flux/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/flux/requirements.txt b/workflows/flux/requirements.txt index 24ce15ab7..8b1378917 100644 --- a/workflows/flux/requirements.txt +++ b/workflows/flux/requirements.txt @@ -1 +1 @@ -numpy + From 5a4552cf21e0ea0d09d3422282ca7ea06bc3330f Mon Sep 17 00:00:00 2001 From: Benjamin Bay <48391872+ben-bay@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:25:42 -0800 Subject: [PATCH 17/19] Update requirements.txt --- workflows/slurm/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflows/slurm/requirements.txt b/workflows/slurm/requirements.txt index 24ce15ab7..8b1378917 100644 --- a/workflows/slurm/requirements.txt +++ b/workflows/slurm/requirements.txt @@ -1 +1 @@ -numpy + From 8a91b17ba5db44c43efd84a7ab5a9acb375febeb Mon Sep 17 00:00:00 2001 From: Benjamin Bay <48391872+ben-bay@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:29:49 -0800 Subject: [PATCH 18/19] Update CHANGELOG.md --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc3c82380..4ab16232a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ All notable changes to Merlin will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [1.0.4] - 2019-12-04 + +### Added +- `requirements.txt` files and `scripts` directories for internal workflow examples. + +### Fixed +- Added missing dependency `tabulate` to `release.txt`. + ## [1.0.3] - 2019-12-04 ### Added From de51554903b7421d8e3f9a52b03d4b0359eb4137 Mon Sep 17 00:00:00 2001 From: Benjamin Bay <48391872+ben-bay@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:33:47 -0800 Subject: [PATCH 19/19] Update __init__.py --- merlin/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merlin/__init__.py b/merlin/__init__.py index d19f10764..2db64ffd4 100644 --- a/merlin/__init__.py +++ b/merlin/__init__.py @@ -38,7 +38,7 @@ import sys -__version__ = "1.0.3" +__version__ = "1.0.4" VERSION = __version__ PATH_TO_PROJ = os.path.join(os.path.dirname(__file__), "")