From 11b2df89ba60e4d1bf18f7e6eac38a46bcb80368 Mon Sep 17 00:00:00 2001 From: Joshua Zenn Date: Thu, 5 May 2022 08:45:38 -0400 Subject: [PATCH 1/3] #89 Removed SA dependency on redis package --- CHANGELOG.md | 14 ++++++++++++-- README.md | 2 +- docs/getting_started.rst | 2 +- docs/pipelines/ha_pipeline.rst | 2 +- docs/pipelines/standalone_pipeline.rst | 2 +- test/ha_pipeline_tests.py | 2 +- test/redis_pipeline_lock_tests.py | 1 - test/standalone_pipeline_tests.py | 2 +- watergrid/pipelines/__init__.py | 3 +-- 9 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aabd8be..a65c656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,6 @@ ## [Unreleased] ### Added -- Support for Python 3.6 through 3.10. (#90) ### Changed @@ -15,6 +14,16 @@ ### Security +## [1.1.1] - 2022-05-05 + +### Added + +- Support for Python 3.6 through 3.10. (#90) + +### Fixed + +- `StandalonePipeline` no longer has a dependency on `redis`. SA and HA pipeline class references must now use the fully-qualified class name. (#89) + ## [1.1.0] - 2022-05-01 ### Added @@ -62,7 +71,8 @@ now be installed separately through `watergrid[...]` metapackages. (#54) - Staggered node startup no longer causes mid-interval pipeline runs on other nodes in HA mode. -[Unreleased]: https://github.com/ARMmaster17/watergrid-python/compare/1.1.0...HEAD +[Unreleased]: https://github.com/ARMmaster17/watergrid-python/compare/1.1.1...HEAD +[1.1.1]: https://github.com/ARMmaster17/watergrid-python/compare/1.1.0...1.1.1 [1.1.0]: https://github.com/ARMmaster17/watergrid-python/compare/1.0.1...1.1.0 [1.0.1]: https://github.com/ARMmaster17/watergrid-python/compare/1.0.0...1.0.1 [1.0.0]: https://github.com/ARMmaster17/watergrid-python/releases/tag/1.0.0 diff --git a/README.md b/README.md index 1800240..13f25a2 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Creating an ETL pipeline with Watergrid is very easy. 1. Paste the following code into a file named `main.py`: ```python -from watergrid.pipelines import StandalonePipeline +from watergrid.pipelines.standalone_pipeline import StandalonePipeline from watergrid.steps import Step from watergrid.context import DataContext diff --git a/docs/getting_started.rst b/docs/getting_started.rst index 6e81ed1..244e78f 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -17,7 +17,7 @@ Create a file called ``main.py`` and paste the following code into it: .. code-block:: python - from watergrid.pipelines import StandalonePipeline + from watergrid.pipelines.standalone_pipeline import StandalonePipeline from watergrid.steps import Step from watergrid.context import DataContext diff --git a/docs/pipelines/ha_pipeline.rst b/docs/pipelines/ha_pipeline.rst index b819090..9f35d76 100644 --- a/docs/pipelines/ha_pipeline.rst +++ b/docs/pipelines/ha_pipeline.rst @@ -13,7 +13,7 @@ Steps .. code-block:: python - from watergrid.pipelines import HAPipeline + from watergrid.pipelines.ha_pipeline import HAPipeline from watergrid.steps import Step from watergrid.context import DataContext from watergrid.locks import RedisPipelineLock diff --git a/docs/pipelines/standalone_pipeline.rst b/docs/pipelines/standalone_pipeline.rst index 8d8fb0d..303f7a2 100644 --- a/docs/pipelines/standalone_pipeline.rst +++ b/docs/pipelines/standalone_pipeline.rst @@ -13,7 +13,7 @@ Steps .. code-block:: python - from watergrid.pipelines import StandalonePipeline + from watergrid.pipelines.standalone_pipeline import StandalonePipeline from watergrid.steps import Step from watergrid.context import DataContext diff --git a/test/ha_pipeline_tests.py b/test/ha_pipeline_tests.py index c9c0770..ed695d7 100644 --- a/test/ha_pipeline_tests.py +++ b/test/ha_pipeline_tests.py @@ -3,7 +3,7 @@ from watergrid.context import DataContext from watergrid.locks import MockPipelineLock -from watergrid.pipelines import HAPipeline +from watergrid.pipelines.ha_pipeline import HAPipeline from watergrid.steps import Step diff --git a/test/redis_pipeline_lock_tests.py b/test/redis_pipeline_lock_tests.py index a621f98..52def72 100644 --- a/test/redis_pipeline_lock_tests.py +++ b/test/redis_pipeline_lock_tests.py @@ -1,6 +1,5 @@ import time import unittest -from time import sleep from watergrid.locks import RedisPipelineLock diff --git a/test/standalone_pipeline_tests.py b/test/standalone_pipeline_tests.py index f9f4704..faf3c92 100644 --- a/test/standalone_pipeline_tests.py +++ b/test/standalone_pipeline_tests.py @@ -1,6 +1,6 @@ import unittest -from watergrid.pipelines import StandalonePipeline +from watergrid.pipelines.standalone_pipeline import StandalonePipeline class StandalonePipelineTestCases(unittest.TestCase): diff --git a/watergrid/pipelines/__init__.py b/watergrid/pipelines/__init__.py index 1f52489..8b13789 100644 --- a/watergrid/pipelines/__init__.py +++ b/watergrid/pipelines/__init__.py @@ -1,2 +1 @@ -from watergrid.pipelines.ha_pipeline import HAPipeline -from watergrid.pipelines.standalone_pipeline import StandalonePipeline + From dc46bd321ac352ddb0ff252e0e8be63de56e5184 Mon Sep 17 00:00:00 2001 From: Joshua Zenn Date: Thu, 5 May 2022 08:49:23 -0400 Subject: [PATCH 2/3] #89 Linter fixes --- CHANGELOG.md | 3 ++- watergrid/pipelines/__init__.py | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a65c656..a49b7e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,8 @@ ### Fixed -- `StandalonePipeline` no longer has a dependency on `redis`. SA and HA pipeline class references must now use the fully-qualified class name. (#89) +- `StandalonePipeline` no longer has a dependency on `redis`. SA and HA +pipeline class references must now use the fully-qualified class name. (#89) ## [1.1.0] - 2022-05-01 diff --git a/watergrid/pipelines/__init__.py b/watergrid/pipelines/__init__.py index 8b13789..e69de29 100644 --- a/watergrid/pipelines/__init__.py +++ b/watergrid/pipelines/__init__.py @@ -1 +0,0 @@ - From 2fe55a331564aa0c0e6b9f96af26fcdd54625385 Mon Sep 17 00:00:00 2001 From: Joshua Zenn Date: Thu, 5 May 2022 09:10:41 -0400 Subject: [PATCH 3/3] #89 Updated documentation for version bump --- .github/SECURITY.md | 10 ++++++---- docs/conf.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/SECURITY.md b/.github/SECURITY.md index 4be239c..0ea2518 100644 --- a/.github/SECURITY.md +++ b/.github/SECURITY.md @@ -2,12 +2,14 @@ ## Supported Versions -While developing the initial alpha release (v1.0.0), only the latest build from the `main` branch will recieve security updates. -Older revisions will not recieve backported updates. +Only the latest minor version of WaterGrid will be supported for security updates. +Older revisions will not receive backported updates. | Version | Supported | -| ------- | ------------------ | -| 0.x.x | :white_check_mark: | +|---------|--------------------| +| 1.1.x | :white_check_mark: | +| 1.0.x | :x: | +| 0.x.x | :x: | ## Reporting a Vulnerability diff --git a/docs/conf.py b/docs/conf.py index b9c2f37..2c86057 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ author = "Joshua Zenn (ARMmaster17)" # The full version, including alpha/beta/rc tags -release = "1.1.0" +release = "1.1.1" # -- General configuration ---------------------------------------------------