Skip to content
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
10 changes: 6 additions & 4 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
15 changes: 13 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
## [Unreleased]

### Added
- Support for Python 3.6 through 3.10. (#90)

### Changed

Expand All @@ -15,6 +14,17 @@

### 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
Expand Down Expand Up @@ -62,7 +72,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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/getting_started.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/pipelines/ha_pipeline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/pipelines/standalone_pipeline.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion test/ha_pipeline_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
1 change: 0 additions & 1 deletion test/redis_pipeline_lock_tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import time
import unittest
from time import sleep

from watergrid.locks import RedisPipelineLock

Expand Down
2 changes: 1 addition & 1 deletion test/standalone_pipeline_tests.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import unittest

from watergrid.pipelines import StandalonePipeline
from watergrid.pipelines.standalone_pipeline import StandalonePipeline


class StandalonePipelineTestCases(unittest.TestCase):
Expand Down
2 changes: 0 additions & 2 deletions watergrid/pipelines/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
from watergrid.pipelines.ha_pipeline import HAPipeline
from watergrid.pipelines.standalone_pipeline import StandalonePipeline