From e4ed0bab6f76dd12d08bb7c22f92cbcd46d9ce79 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 28 Oct 2020 17:37:43 -0400 Subject: [PATCH 1/5] Add building and pushing docs to s3 --- .travis.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9c73976b..b00f6bb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -100,6 +100,19 @@ jobs: after_success: - python -m pip install twine - python -m twine upload wheelhouse/*.whl + - python: 3.8 + if: branch = develop + install: + - pip install -r requirements-doc.txt + - pip install awscli + - pip install -e . + script: (cd docs && make clean html) + after_success: + - aws s3 sync docs/_build/html s3://python-dependency-injector-docs --delete + - aws cloudfront create-invalidation --distribution-id ${AWS_CLOUDFRONT_DISTRIBUTION_ID} --path "/*" > /dev/null + - echo "Cache invalidation triggered" +echo "Result: OK" + - python -m twine upload wheelhouse/*.whl notifications: slack: rooms: From b7e7d8a171db9c4b28d3cb9401515a18c2524514 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 28 Oct 2020 20:36:45 -0400 Subject: [PATCH 2/5] Make alabaster theme pinning like on RTD --- requirements-doc.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-doc.txt b/requirements-doc.txt index 1223452c..1141b078 100644 --- a/requirements-doc.txt +++ b/requirements-doc.txt @@ -1,5 +1,5 @@ sphinx -alabaster>=0.7.12 +alabaster>=0.7,<0.8,!=0.7.5 -e git://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus -r requirements-ext.txt From bf82f594b42c80f2833c45a500938fe0cba1913a Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 28 Oct 2020 20:48:07 -0400 Subject: [PATCH 3/5] Add google analytics id --- docs/conf.py | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/conf.py b/docs/conf.py index 04e3587e..57dde9d1 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -305,4 +305,5 @@ html_theme_options = { 'logo': 'logo.svg', 'description': 'Dependency injection framework for Python', 'code_font_size': '10pt', + 'analytics_id': 'UA-67012059-1', } From cdc5e84e7f598a71c9f128df8b6b76e338368531 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 28 Oct 2020 20:48:21 -0400 Subject: [PATCH 4/5] Remove alabaster pinning --- requirements-doc.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements-doc.txt b/requirements-doc.txt index 1141b078..f0fdcb40 100644 --- a/requirements-doc.txt +++ b/requirements-doc.txt @@ -1,5 +1,4 @@ sphinx -alabaster>=0.7,<0.8,!=0.7.5 -e git://github.com/rmk135/sphinxcontrib-disqus.git#egg=sphinxcontrib-disqus -r requirements-ext.txt From f7499354ec82f9b4f6779eda0267925703af5a31 Mon Sep 17 00:00:00 2001 From: Roman Mogylatov Date: Wed, 28 Oct 2020 21:02:21 -0400 Subject: [PATCH 5/5] Bump version to 4.1.7 --- .travis.yml | 2 +- docs/main/changelog.rst | 4 ++++ src/dependency_injector/__init__.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b00f6bb9..9993f92d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -101,7 +101,7 @@ jobs: - python -m pip install twine - python -m twine upload wheelhouse/*.whl - python: 3.8 - if: branch = develop + if: branch = master install: - pip install -r requirements-doc.txt - pip install awscli diff --git a/docs/main/changelog.rst b/docs/main/changelog.rst index 5816a4e9..637140df 100644 --- a/docs/main/changelog.rst +++ b/docs/main/changelog.rst @@ -7,6 +7,10 @@ that were made in every particular version. From version 0.7.6 *Dependency Injector* framework strictly follows `Semantic versioning`_ +4.1.7 +----- +- Add CI job to build and push documentation to S3 bucket. + 4.1.6 ----- - Fix wiring of multiple containers diff --git a/src/dependency_injector/__init__.py b/src/dependency_injector/__init__.py index 5fc48203..183f4fd7 100644 --- a/src/dependency_injector/__init__.py +++ b/src/dependency_injector/__init__.py @@ -1,6 +1,6 @@ """Top-level package.""" -__version__ = '4.1.6' +__version__ = '4.1.7' """Version number. :type: str