Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relaxed a bunch of dependencies and removed setuptools #454

Merged
merged 2 commits into from
Apr 9, 2022
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
8 changes: 4 additions & 4 deletions poetry.lock

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

17 changes: 8 additions & 9 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,23 +36,22 @@ vpype = "vpype_cli.cli:cli"
python = ">=3.8, <3.11"
cachetools = ">=4.2.2"
click = ">=8.0.1,<8.2.0"
multiprocess = "^0.70.11"
multiprocess = ">=0.70.11"
numpy = ">=1.20"
pnoise = "^0.1.0"
pnoise = ">=0.1.0"
Shapely = {extras = ["vectorized"], version = ">=1.8.1.post1"} # 1.8.1 breaks win installer
scipy = "^1.6"
setuptools = "^51.0.0"
scipy = ">=1.6"
svgelements = ">=1.6.10"
svgwrite = "~1.4"
tomli = "^2.0.0"
asteval = "^0.9.26"
tomli = ">=2.0.0"
asteval = ">=0.9.26"

# additional dependencies for the viewer and the `show` command
matplotlib = { version = ">=3.3.2,<3.6.0", optional = true }
glcontext = { version = ">=2.3.2", optional = true } # 2.3.2 needed to fix #200
moderngl = { version = "^5.6.2", optional = true }
moderngl = { version = ">=5.6.2", optional = true }
Pillow = { version = ">=9.0.1", optional = true }
PySide2 = { version = "^5.15.2", optional = true }
PySide2 = { version = ">=5.15.2", optional = true }


[tool.poetry.dev-dependencies]
Expand All @@ -62,7 +61,7 @@ pytest-cov = ">=2.11.0"
pytest-benchmark = ">=3.2.3"
black = ">=22.3.0"
isort = ">=5.8.0"
pyinstaller = "^4.3"
pyinstaller = ">=4.3"
pyinstaller-hooks-contrib = ">=2022.3" # fix for shapely 1.8.1
packaging = ">=20.8"
pytest-mpl = ">=0.12"
Expand Down
4 changes: 2 additions & 2 deletions vpype/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@


def _get_version() -> str:
import pkg_resources
from importlib.metadata import version

return pkg_resources.get_distribution("vpype").version
return version(__name__)


__version__ = _get_version()