Skip to content

Commit

Permalink
Merge pull request #16 from zalando-incubator/docs
Browse files Browse the repository at this point in the history
Moving Sphinx dependencies back out of dev.
  • Loading branch information
bmaher authored May 21, 2019
2 parents 0242d1a + 989f7aa commit 08b7fb5
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 31 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.2.10][] - 2019-05-21

### Fixed

- Failing Read The Docs build.

## [1.2.9][] - 2019-05-21

### Added
Expand Down Expand Up @@ -75,6 +81,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Implemented `-v`/`--version` option to show Zelt version.
- This changelog.

[1.2.10]: https://github.com/zalando-incubator/zelt/compare/v1.2.9...v1.2.10
[1.2.9]: https://github.com/zalando-incubator/zelt/compare/v1.2.8...v1.2.9
[1.2.8]: https://github.com/zalando-incubator/zelt/compare/v1.2.7...v1.2.8
[1.2.7]: https://github.com/zalando-incubator/zelt/compare/v1.2.6...v1.2.7
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.PHONY: install
install:
poetry install
poetry install -E docs

.PHONY: test
test:
Expand Down
55 changes: 29 additions & 26 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 8 additions & 4 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "zelt"
version = "1.2.9"
version = "1.2.10"
description = "Zalando end-to-end load tester"
authors = [
"Brian Maher <[email protected]>",
Expand Down Expand Up @@ -31,14 +31,18 @@ tenacity = "^5.0"
docopt = "^0.6.2"
pyyaml = "^5.1"

sphinx = { version = "^1.8", optional = true }
sphinx-autodoc-typehints = { version = "^1.6", optional = true }
sphinx-issues = { version = "^1.2", optional = true }

[tool.poetry.extras]
docs = ["sphinx", "sphinx-autodoc-typehints", "sphinx-issues"]

[tool.poetry.dev-dependencies]
pytest-cov = "^2.6"
pytest = "^4.3"
pylint = "^2.3"
pytest-watch = "^4.2"
sphinx = "^1.8"
sphinx-autodoc-typehints = "^1.6"
sphinx-issues = "^1.2"

[tool.poetry.scripts]
zelt = "main:cli"
Expand Down

0 comments on commit 08b7fb5

Please sign in to comment.