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

1.6.2 #244

Merged
merged 39 commits into from
Jul 6, 2020
Merged

1.6.2 #244

merged 39 commits into from
Jul 6, 2020

Conversation

ben-bay
Copy link
Contributor

@ben-bay ben-bay commented Jul 2, 2020

No description provided.

ben-bay and others added 30 commits May 18, 2020 10:01
* The broker name can now be amqps (with ssl) or amqp (without ssl).
The default rabbitmq vhost is now <user> instead of /<user>.

* Undo fix typos.

* Fix spacing.

* Add amqps conn for self doc.
* updated default task timeout

* Added to CHANGELOG
* Add init_key to create the encryption key when merlin config is run.

* Move import to point of use for encryption.
* Fix sleep variable.

* Change another sleep variable.

* Change brackets.

* Fix clarity for jobs but no consumers condition.

* Fix comment.

* Update comment.

* Move check_merlin_status to router.

* Run fix-style.
* working on bugfix

* achieved desired behavior

* made expansion anf filewriting conditional

* fixed style

* updated CHANGELOG

* fixed samples and restart

* fixed style

* used variable

* added name expansion test

* temporarily commented out one test

* fixed style

* added debug block

* changes

* corrected bug

* updated example; scripts are now copied into merlin_info
* exposed visibility timeout in config file

* added visibility timeouts to default config files

* fixed style

* added seconds to clarify name

* fixed attribute name

* locked celery version at 4.4.2

* updated CHANGELOG
* Add a timeout check for the merlin info kombu connection test. The redis
server will not comply with the connection_timeout config.

* Update docs.
* bugfix

* removed repetition in logic
* sample generation is now logged to merlin_info

* Added to CHANGELOG

* fixed style
* working on adding maestro's schema validation to merlin

* updated schemas

* adding merlin_schema to spec logic

* added debug prints

* added print

* fixing vestigial Maestro calls

* adjusted merlin_schemas

* fixed json file

* validation progress

* added from_dict replacement logic

* adjusted maestrowf version req

* fixed string

* schema improvements

* merlinsection schema updates

* merlin section error parsing appears to work

* updated CHANGELOG

* fixed merge error

* Added walltime to json schema
* Change the expand_tasks_with_samples task to use an immutable signature,
no return code is neccessary.

* Change only expand_tasks_with_samples to si()

* Increase celery version requirement to the latest (4.4.5).

* Update CHANGELOG.

Co-authored-by: Benjamin Bay <48391872+ben-bay@users.noreply.github.com>
* added tests to run_tests.py

* updated merlinsection schema

* added full_spec test

* added to CHANGELOG
* now using regex to find variable tokens

* added shell ref function
ben-bay and others added 4 commits July 2, 2020 12:02
* reverted support of Maestro 1.1.8

* removed tests that use maestro validation

* fixed style
* fixed cli tests, reactivated 3 old ones

* added to CHANGELOG
* added orig.yaml and expanded.yaml

* added partial provenance spec

* fixed style

* added to CHANGELOG

* removed comments

* made env replacement more precise

* fixed restart bug

* changed provenance file names

* logic update

* fixed style

* expansion now working

* added cli test logic to test all 3 provenance file types

* updated CHANGELOG

* expansion sans io (#243)

* reverted support of Maestro 1.1.8

* removed tests that use maestro validation

* fixed style

* added sections property to spec

* reducing number of file writes and reads

* provenance specs are correct

* fixed style

* removed unused imports

* cleaning up logic

* fixed style

* final logic improvements

* removed unused property

* updated CHANGELOG
@ben-bay ben-bay requested review from koning and lucpeterson and removed request for koning July 2, 2020 23:08
@ben-bay ben-bay self-assigned this Jul 2, 2020
@ben-bay ben-bay merged commit 3f5ad6d into master Jul 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants