From 1b0b570f64355fe32ddca071bd0af5eb267e4aa2 Mon Sep 17 00:00:00 2001 From: Vanessasaurus <814322+vsoch@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:26:12 -0800 Subject: [PATCH] fixing issue with flask + itsdangerous (#153) Signed-off-by: vsoch Co-authored-by: vsoch --- CHANGELOG.md | 1 + LICENSE | 4 +--- expfactory/api.py | 2 +- expfactory/cli/__init__.py | 2 +- expfactory/cli/build.py | 2 +- expfactory/cli/install.py | 2 +- expfactory/cli/list.py | 2 +- expfactory/cli/logs.py | 2 +- expfactory/cli/main.py | 2 +- expfactory/cli/users.py | 2 +- expfactory/database/filesystem.py | 2 +- expfactory/database/models.py | 2 +- expfactory/database/relational.py | 2 +- expfactory/database/sqlite.py | 2 +- expfactory/defaults.py | 2 +- expfactory/experiment.py | 2 +- expfactory/forms.py | 2 +- expfactory/logger/message.py | 2 +- expfactory/logger/spinner.py | 2 +- expfactory/server.py | 2 +- expfactory/templates/experiments/template.py | 2 +- expfactory/testing/test_client.py | 2 +- expfactory/testing/test_experiment.py | 2 +- expfactory/utils.py | 2 +- expfactory/validator/experiments.py | 2 +- expfactory/validator/library.py | 2 +- expfactory/validator/runtime.py | 2 +- expfactory/validator/utils.py | 2 +- expfactory/variables.py | 2 +- expfactory/version.py | 7 ++++--- expfactory/views/database.py | 2 +- expfactory/views/general.py | 2 +- expfactory/views/headless.py | 2 +- expfactory/views/main.py | 2 +- expfactory/views/utils.py | 2 +- 35 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe1ab6b..d90f6c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Critical items to know are: ## [v3.x](https://github.com/expfactory/expfactory/tree/master) (master) + - updating flask to 1.1.4 (3.2.12) - updating yaml to use safe_load (3.2.11) - adding support for receiving a token in the url and updating docs template (3.2.0) - setting csrf token expire time to 3 hours (3.19) diff --git a/LICENSE b/LICENSE index 4c8259e..d38a311 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,4 @@ -BSD 3-Clause License - -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/api.py b/expfactory/api.py index 5a2b66d..251aca6 100644 --- a/expfactory/api.py +++ b/expfactory/api.py @@ -1,7 +1,7 @@ """ api.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/__init__.py b/expfactory/cli/__init__.py index 76d006f..29c5afd 100644 --- a/expfactory/cli/__init__.py +++ b/expfactory/cli/__init__.py @@ -3,7 +3,7 @@ """ client initialization: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/build.py b/expfactory/cli/build.py index 72c092a..d034b6a 100644 --- a/expfactory/cli/build.py +++ b/expfactory/cli/build.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/cli/install.py b/expfactory/cli/install.py index 6ef6c71..106d714 100644 --- a/expfactory/cli/install.py +++ b/expfactory/cli/install.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/list.py b/expfactory/cli/list.py index bda808f..9138469 100644 --- a/expfactory/cli/list.py +++ b/expfactory/cli/list.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/logs.py b/expfactory/cli/logs.py index f898a56..0b21983 100644 --- a/expfactory/cli/logs.py +++ b/expfactory/cli/logs.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/main.py b/expfactory/cli/main.py index a2ce4e1..a8f7b27 100644 --- a/expfactory/cli/main.py +++ b/expfactory/cli/main.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/cli/users.py b/expfactory/cli/users.py index 36c8761..5e4151b 100644 --- a/expfactory/cli/users.py +++ b/expfactory/cli/users.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/database/filesystem.py b/expfactory/database/filesystem.py index d7a15e5..988e241 100644 --- a/expfactory/database/filesystem.py +++ b/expfactory/database/filesystem.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/database/models.py b/expfactory/database/models.py index 238ae97..3db8049 100644 --- a/expfactory/database/models.py +++ b/expfactory/database/models.py @@ -1,7 +1,7 @@ """ models.py: datanases for the expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/database/relational.py b/expfactory/database/relational.py index 52c9644..d6fd01b 100644 --- a/expfactory/database/relational.py +++ b/expfactory/database/relational.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/database/sqlite.py b/expfactory/database/sqlite.py index 80ee84b..83feaef 100644 --- a/expfactory/database/sqlite.py +++ b/expfactory/database/sqlite.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/defaults.py b/expfactory/defaults.py index d2a2bff..bd802da 100644 --- a/expfactory/defaults.py +++ b/expfactory/defaults.py @@ -10,7 +10,7 @@ case that required = True. A required = True variable not found will system exit with an error. -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/experiment.py b/expfactory/experiment.py index cbb3194..2cbf37a 100644 --- a/expfactory/experiment.py +++ b/expfactory/experiment.py @@ -1,7 +1,7 @@ """ experiment.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/forms.py b/expfactory/forms.py index 808b323..c39919c 100644 --- a/expfactory/forms.py +++ b/expfactory/forms.py @@ -1,7 +1,7 @@ """ views.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/logger/message.py b/expfactory/logger/message.py index 7d27264..e3c8224 100644 --- a/expfactory/logger/message.py +++ b/expfactory/logger/message.py @@ -2,7 +2,7 @@ logger/message.py: Python logger base for expfactory -Copyright (c) 2016-2021 Vanessa Sochat +Copyright (c) 2016-2022 Vanessa Sochat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/expfactory/logger/spinner.py b/expfactory/logger/spinner.py index a03defe..eb3e73d 100644 --- a/expfactory/logger/spinner.py +++ b/expfactory/logger/spinner.py @@ -2,7 +2,7 @@ logger/spinner.py: Simple spinner for logger -Copyright (c) 2017-2021 Vanessa Sochat +Copyright (c) 2017-2022 Vanessa Sochat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/expfactory/server.py b/expfactory/server.py index 6b720ed..cca4449 100644 --- a/expfactory/server.py +++ b/expfactory/server.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2016-2021, Vanessa Sochat +Copyright (c) 2016-2022, Vanessa Sochat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/expfactory/templates/experiments/template.py b/expfactory/templates/experiments/template.py index 7a4a3c3..6ed0f6f 100644 --- a/expfactory/templates/experiments/template.py +++ b/expfactory/templates/experiments/template.py @@ -1,7 +1,7 @@ ''' dynamic_views.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/testing/test_client.py b/expfactory/testing/test_client.py index e555415..e8fbf19 100644 --- a/expfactory/testing/test_client.py +++ b/expfactory/testing/test_client.py @@ -3,7 +3,7 @@ """ Test experiments -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/testing/test_experiment.py b/expfactory/testing/test_experiment.py index 811fb08..a93f19a 100644 --- a/expfactory/testing/test_experiment.py +++ b/expfactory/testing/test_experiment.py @@ -3,7 +3,7 @@ """ Test experiments -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/utils.py b/expfactory/utils.py index 29436ab..6f9a0f3 100644 --- a/expfactory/utils.py +++ b/expfactory/utils.py @@ -1,7 +1,7 @@ """ utils.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. diff --git a/expfactory/validator/experiments.py b/expfactory/validator/experiments.py index 4d15af9..faa75ed 100644 --- a/expfactory/validator/experiments.py +++ b/expfactory/validator/experiments.py @@ -3,7 +3,7 @@ validators/experiments.py: python functions to validate experiments and library experiment objects -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/validator/library.py b/expfactory/validator/library.py index df3a206..ff5c42f 100644 --- a/expfactory/validator/library.py +++ b/expfactory/validator/library.py @@ -2,7 +2,7 @@ validators/library.py: python functions to validate library -Copyright (c) 2017-2021 Vanessa Sochat +Copyright (c) 2017-2022 Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/validator/runtime.py b/expfactory/validator/runtime.py index 90d4d0d..41feeb6 100644 --- a/expfactory/validator/runtime.py +++ b/expfactory/validator/runtime.py @@ -2,7 +2,7 @@ validators/runtime.py: python functions to validate deployments -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/validator/utils.py b/expfactory/validator/utils.py index 805ffaa..426ab49 100644 --- a/expfactory/validator/utils.py +++ b/expfactory/validator/utils.py @@ -2,7 +2,7 @@ validators/utils.py: utility functions for validation objects -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/variables.py b/expfactory/variables.py index cd82e47..14487d7 100644 --- a/expfactory/variables.py +++ b/expfactory/variables.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2018-2021, Vanessa Sochat +Copyright (c) 2018-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/version.py b/expfactory/version.py index c09ab40..29a7c4a 100644 --- a/expfactory/version.py +++ b/expfactory/version.py @@ -1,6 +1,6 @@ """ -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without @@ -30,7 +30,7 @@ """ -__version__ = "3.2.11" +__version__ = "3.2.12" AUTHOR = "Vanessa Sochat" AUTHOR_EMAIL = "vsoch@users.noreply.github.com" NAME = "expfactory" @@ -40,12 +40,13 @@ LICENSE = "LICENSE" INSTALL_REQUIRES = ( - ("flask", {"exact_version": "1.0.2"}), + ("flask", {"exact_version": "1.1.4"}), ("flask-restful", {"min_version": "0.3.6"}), ("flask-blueprint", {"exact_version": "1.2.2"}), ("Flask-WTF", {"min_version": "0.14.2"}), ("Flask-SQLAlchemy", {"min_version": "2.3.2"}), ("flask-cors", {"min_version": "3.0.6"}), + ("markupsafe", {"exact_version": "2.0.1"}), ("requests", {"min_version": "2.12.4"}), ("retrying", {"min_version": "1.3.3"}), ) diff --git a/expfactory/views/database.py b/expfactory/views/database.py index 3485d5d..78177db 100644 --- a/expfactory/views/database.py +++ b/expfactory/views/database.py @@ -1,7 +1,7 @@ """ database.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/views/general.py b/expfactory/views/general.py index 4a2cfe9..5a88dc3 100644 --- a/expfactory/views/general.py +++ b/expfactory/views/general.py @@ -1,7 +1,7 @@ """ general.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/views/headless.py b/expfactory/views/headless.py index 094f8c8..391b701 100644 --- a/expfactory/views/headless.py +++ b/expfactory/views/headless.py @@ -1,7 +1,7 @@ """ headless.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/views/main.py b/expfactory/views/main.py index 97f6f5d..8ef9ada 100644 --- a/expfactory/views/main.py +++ b/expfactory/views/main.py @@ -1,7 +1,7 @@ """ views.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/expfactory/views/utils.py b/expfactory/views/utils.py index 6b3cd38..01dea3f 100644 --- a/expfactory/views/utils.py +++ b/expfactory/views/utils.py @@ -1,7 +1,7 @@ """ views.py: part of expfactory package -Copyright (c) 2017-2021, Vanessa Sochat +Copyright (c) 2017-2022, Vanessa Sochat All rights reserved. Redistribution and use in source and binary forms, with or without