Skip to content

Commit

Permalink
chore: small fixes to make typing/tests/docs pass
Browse files Browse the repository at this point in the history
  • Loading branch information
wpk committed Sep 26, 2023
1 parent 0a4faee commit 1454a8d
Show file tree
Hide file tree
Showing 21 changed files with 106 additions and 920 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,4 @@ cog-readme: ## apply cog to README.md
# Can't seem to convert
.PHONY: README.pdf
README.pdf: ## create README.pdf
P2C_USE_CLICK=false cog -P -o tmp.md README.md
-pre-commit run markdownlint --files tmp.md
pandoc -V colorlinks tmp.md -o README.pdf
rm tmp.md
pandoc -V colorlinks README.md -o README.pdf
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ sys.path.pop(0)
<!-- [[[end]]] -->

Consider the `toml` file
[test-pyproject.toml](./tests/data/test-pyproject.toml).
[test-pyproject.toml](https://github.com/usnistgov/pyproject2conda/blob/main/tests/data/test-pyproject.toml).

<!-- prettier-ignore-start -->
<!-- markdownlint-disable-next-line MD013 -->
Expand Down Expand Up @@ -322,6 +322,8 @@ dependencies:
<!-- [[[end]]] -->
You can also call with `python -m pyproject2conda`.
### Installing extras
Given the extra dependency:
Expand All @@ -339,8 +341,8 @@ test = [
]
dev-extras = [
# p2c: -s "additional-thing; python_version < '3.9'" # this is an additional conda package
## p2c: -s "another-thing" # this will be skipped because of ## before p2c.
# p2c: -s "additional-thing; python_version < '3.9'" # additional pkg
## p2c: -s "another-thing" # skipped because of ## before p2c.
"matplotlib", # p2c: -s conda-matplotlib
]
Expand Down
101 changes: 0 additions & 101 deletions docs/examples/usage/demo.ipynb

This file was deleted.

1 change: 1 addition & 0 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ The conda-forge distribution of [typer] (which `pyproject2conda` uses) installs

[rich]: https://github.com/Textualize/rich
[shellingham]: https://github.com/sarugaku/shellingham
[typer]: https://github.com/tiangolo/typer

This is the preferred method to install pyproject2conda, as it will always
install the most recent stable release.
Expand Down
1 change: 1 addition & 0 deletions docs/reference/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Modules
parser
config
cli
Expand Down
101 changes: 0 additions & 101 deletions examples/usage/demo.ipynb

This file was deleted.

11 changes: 8 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ dependencies = [
"typer",
# "rich-click",
"packaging",
# "typing-extensions; python_version<'3.10'",

"typing-extensions; python_version<'3.9'",
] # additional packages

[project.urls]
Expand Down Expand Up @@ -363,7 +362,13 @@ module = []

[tool.pyright]
include = ["src", "tests"]
exclude = ["**/__pycache__", ".tox/**", ".nox/**", "**/.mypy_cache"]
exclude = [
"**/__pycache__",
".tox/**",
".nox/**",
"**/.mypy_cache",
"**/_version.py"
]
# extraPaths = ["."]
# TODO: add strict to pyright
# strict = ["src"]
Expand Down
1 change: 1 addition & 0 deletions requirements/dev-base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ tomli
tomlkit
typer
types-click
typing-extensions; python_version<'3.9'
1 change: 1 addition & 0 deletions requirements/dev-complete.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,4 @@ tomli
tomlkit
typer
types-click
typing-extensions; python_version<'3.9'
1 change: 1 addition & 0 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ tomli
tomlkit
typer
types-click
typing-extensions; python_version<'3.9'
1 change: 1 addition & 0 deletions requirements/docs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ sphinxcontrib-spelling
tomli
tomlkit
typer
typing-extensions; python_version<'3.9'
1 change: 1 addition & 0 deletions requirements/py38-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ dependencies:
- tomli
- tomlkit
- typer
- typing-extensions
1 change: 1 addition & 0 deletions requirements/py38-typing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ dependencies:
- tomlkit
- typer
- types-click
- typing-extensions
1 change: 1 addition & 0 deletions requirements/test.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ ruamel.yaml
tomli
tomlkit
typer
typing-extensions; python_version<'3.9'
1 change: 1 addition & 0 deletions requirements/typing.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ tomli
tomlkit
typer
types-click
typing-extensions; python_version<'3.9'
Loading

0 comments on commit 1454a8d

Please sign in to comment.