From e53e13112ba59b7641917ea6c1672233f4d41d64 Mon Sep 17 00:00:00 2001 From: Ivan Ogasawara Date: Mon, 14 Oct 2024 21:40:01 -0400 Subject: [PATCH] fix: Fix xonsh version (#120) * Remove support for python 3.8 --- .github/workflows/docs.yaml | 4 +- .github/workflows/main.yaml | 2 +- poetry.lock | 116 ++++++++---------------------------- pyproject.toml | 4 +- 4 files changed, 31 insertions(+), 95 deletions(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index e16d1d4..0e1b7cc 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -11,7 +11,7 @@ env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} jobs: - release: + gen-docs: runs-on: ubuntu-latest timeout-minutes: 15 @@ -30,7 +30,7 @@ jobs: activate-environment: makim auto-update-conda: true conda-solver: libmamba - python-version: "3.8" + python-version: "3.9" - name: Install deps run: | diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index f398f1b..d2bead9 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -30,9 +30,9 @@ jobs: tests: strategy: + fail-fast: false matrix: python_version: - - "3.8" - "3.9" - "3.10" - "3.11" diff --git a/poetry.lock b/poetry.lock index 0c2ffae..d6e4ef6 100644 --- a/poetry.lock +++ b/poetry.lock @@ -141,21 +141,6 @@ six = ">=1.12.0" astroid = ["astroid (>=1,<2)", "astroid (>=2,<4)"] test = ["astroid (>=1,<2)", "astroid (>=2,<4)", "pytest"] -[[package]] -name = "astunparse" -version = "1.6.3" -description = "An AST unparser for Python" -optional = false -python-versions = "*" -files = [ - {file = "astunparse-1.6.3-py2.py3-none-any.whl", hash = "sha256:c2652417f2c8b5bb325c885ae329bdf3f86424075c4fd1a128674bc6fba4b8e8"}, - {file = "astunparse-1.6.3.tar.gz", hash = "sha256:5ad93a8456f0d084c3456d059fd9a92cce667963232cbf763eac3bc5b7940872"}, -] - -[package.dependencies] -six = ">=1.6.1,<2.0" -wheel = ">=0.23.0,<1.0" - [[package]] name = "async-lru" version = "2.0.4" @@ -200,9 +185,6 @@ files = [ {file = "babel-2.15.0.tar.gz", hash = "sha256:8daf0e265d05768bc6c7a314cf1321e9a123afc328cc635c18622a2f30a04413"}, ] -[package.dependencies] -pytz = {version = ">=2015.7", markers = "python_version < \"3.9\""} - [package.extras] dev = ["freezegun (>=1.0,<2.0)", "pytest (>=6.0)", "pytest-cov"] @@ -280,6 +262,17 @@ webencodings = "*" [package.extras] css = ["tinycss2 (>=1.1.0,<1.3)"] +[[package]] +name = "case-insensitive-dictionary" +version = "0.2.1" +description = "Typed Python Case Insensitive Dictionary" +optional = false +python-versions = ">=3.7,<4.0" +files = [ + {file = "case-insensitive-dictionary-0.2.1.tar.gz", hash = "sha256:7e94726f97eb2c0ceac53209971db50ffc996def663e5e5080d0a1acb4a42280"}, + {file = "case_insensitive_dictionary-0.2.1-py3-none-any.whl", hash = "sha256:a8971780be1ba25e363db259515f0a2f003013465f82552e2f9aed08d5a9ca28"}, +] + [[package]] name = "certifi" version = "2024.2.2" @@ -799,7 +792,6 @@ files = [ ] [package.dependencies] -astunparse = {version = ">=1.6", markers = "python_version < \"3.9\""} colorama = ">=0.4" [[package]] @@ -902,24 +894,6 @@ docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.link perf = ["ipython"] testing = ["flufl.flake8", "importlib-resources (>=1.3)", "jaraco.test (>=5.4)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-perf (>=0.9.2)", "pytest-ruff (>=0.2.1)"] -[[package]] -name = "importlib-resources" -version = "6.4.0" -description = "Read resources from Python packages" -optional = false -python-versions = ">=3.8" -files = [ - {file = "importlib_resources-6.4.0-py3-none-any.whl", hash = "sha256:50d10f043df931902d4194ea07ec57960f66a80449ff867bfe782b4c486ba78c"}, - {file = "importlib_resources-6.4.0.tar.gz", hash = "sha256:cdb2b453b8046ca4e3798eb1d84f3cce1446a0e8e7b5ef4efb600f19fc398145"}, -] - -[package.dependencies] -zipp = {version = ">=3.1.0", markers = "python_version < \"3.10\""} - -[package.extras] -docs = ["furo", "jaraco.packaging (>=9.3)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (<7.2.5)", "sphinx (>=3.5)", "sphinx-lint"] -testing = ["jaraco.test (>=5.4)", "pytest (>=6)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=2.2)", "pytest-mypy", "pytest-ruff (>=0.2.1)", "zipp (>=3.17)"] - [[package]] name = "iniconfig" version = "2.0.0" @@ -1090,11 +1064,9 @@ files = [ attrs = ">=22.2.0" fqdn = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} idna = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} isoduration = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} jsonpointer = {version = ">1.13", optional = true, markers = "extra == \"format-nongpl\""} jsonschema-specifications = ">=2023.03.6" -pkgutil-resolve-name = {version = ">=1.3.10", markers = "python_version < \"3.9\""} referencing = ">=0.28.4" rfc3339-validator = {version = "*", optional = true, markers = "extra == \"format-nongpl\""} rfc3986-validator = {version = ">0.1.0", optional = true, markers = "extra == \"format-nongpl\""} @@ -1118,7 +1090,6 @@ files = [ ] [package.dependencies] -importlib-resources = {version = ">=1.4.0", markers = "python_version < \"3.9\""} referencing = ">=0.31.0" [[package]] @@ -1274,7 +1245,6 @@ files = [ async-lru = ">=1.0.0" httpx = ">=0.25.0" importlib-metadata = {version = ">=4.8.3", markers = "python_version < \"3.10\""} -importlib-resources = {version = ">=1.4", markers = "python_version < \"3.9\""} ipykernel = ">=6.5.0" jinja2 = ">=3.0.3" jupyter-core = "*" @@ -2188,17 +2158,6 @@ files = [ {file = "pickleshare-0.7.5.tar.gz", hash = "sha256:87683d47965c1da65cdacaf31c8441d12b8044cdec9aca500cd78fc2c683afca"}, ] -[[package]] -name = "pkgutil-resolve-name" -version = "1.3.10" -description = "Resolve a name to an object." -optional = false -python-versions = ">=3.6" -files = [ - {file = "pkgutil_resolve_name-1.3.10-py3-none-any.whl", hash = "sha256:ca27cc078d25c5ad71a9de0a7a330146c4e014c2462d9af19c6b828280649c5e"}, - {file = "pkgutil_resolve_name-1.3.10.tar.gz", hash = "sha256:357d6c9e6a755653cfd78893817c0853af365dd51ec97f3d358a819373bbd174"}, -] - [[package]] name = "platformdirs" version = "4.2.1" @@ -2475,17 +2434,6 @@ files = [ [package.dependencies] Levenshtein = "0.25.1" -[[package]] -name = "pytz" -version = "2024.1" -description = "World timezone definitions, modern and historical" -optional = false -python-versions = "*" -files = [ - {file = "pytz-2024.1-py2.py3-none-any.whl", hash = "sha256:328171f4e3623139da4983451950b28e95ac706e13f3f2630a879749e7a8b319"}, - {file = "pytz-2024.1.tar.gz", hash = "sha256:2a29735ea9c18baf14b448846bde5a48030ed267578472d8955cd0e7443a9812"}, -] - [[package]] name = "pywin32" version = "306" @@ -2963,7 +2911,6 @@ files = [ [package.dependencies] markdown-it-py = ">=2.2.0" pygments = ">=2.13.0,<3.0.0" -typing-extensions = {version = ">=4.0.0,<5.0", markers = "python_version < \"3.9\""} [package.extras] jupyter = ["ipywidgets (>=7.5.1,<9)"] @@ -3552,45 +3499,34 @@ docs = ["Sphinx (>=6.0)", "myst-parser (>=2.0.0)", "sphinx-rtd-theme (>=1.1.0)"] optional = ["python-socks", "wsaccel"] test = ["websockets"] -[[package]] -name = "wheel" -version = "0.43.0" -description = "A built-package format for Python" -optional = false -python-versions = ">=3.8" -files = [ - {file = "wheel-0.43.0-py3-none-any.whl", hash = "sha256:55c570405f142630c6b9f72fe09d9b67cf1477fcf543ae5b8dcb1f5b7377da81"}, - {file = "wheel-0.43.0.tar.gz", hash = "sha256:465ef92c69fa5c5da2d1cf8ac40559a8c940886afcef87dcf14b9470862f1d85"}, -] - -[package.extras] -test = ["pytest (>=6.0.0)", "setuptools (>=65)"] - [[package]] name = "xonsh" -version = "0.14.0" -description = "Python-powered, cross-platform, Unix-gazing shell" +version = "0.18.3" +description = "Python-powered shell. Full-featured and cross-platform." optional = false -python-versions = ">=3.8" +python-versions = ">=3.9" files = [ - {file = "xonsh-0.14.0-py310-none-any.whl", hash = "sha256:72506c6dc494103df6d04467e127abddb1c6cbe05cc5903b6a4cbfbad217ff5d"}, - {file = "xonsh-0.14.0-py311-none-any.whl", hash = "sha256:678a65671bd0a62cdc43e932d6aecc8b1622aa18942e0afb388b8b8ae02f67a5"}, - {file = "xonsh-0.14.0-py38-none-any.whl", hash = "sha256:25976edc5695fb5806b8b23f384ff48e618e07f4596ec0806007f63122917a83"}, - {file = "xonsh-0.14.0-py39-none-any.whl", hash = "sha256:751b615726d2322d43c8166ad4bc5cbe65d03a3728f1837aa02380fa9fadb189"}, - {file = "xonsh-0.14.0.tar.gz", hash = "sha256:45a8aaabb17ce0d6d4eca9b709ecfd7ce1c8fb92162decd29a45bf88a60e9bf1"}, + {file = "xonsh-0.18.3-py310-none-any.whl", hash = "sha256:2b371e5e984481c46a2bd65412762971ad35005988102ffbbc5ed2e0361c89ec"}, + {file = "xonsh-0.18.3-py311-none-any.whl", hash = "sha256:f02b2869b4801e7c6b8c22ade4b5e39ed31652b97b7426b607dfd59109414b0d"}, + {file = "xonsh-0.18.3-py312-none-any.whl", hash = "sha256:4d4e8a3cec130ed77056c5e703f00ed922d9da00685de10e30391f445bd50e9a"}, + {file = "xonsh-0.18.3-py39-none-any.whl", hash = "sha256:43340cdea9b04e114dd4e36b974a4bdbaeb3761cfe2073a05005d66457fcafb4"}, + {file = "xonsh-0.18.3.tar.gz", hash = "sha256:e57630d3f7e77e083618751402bf486bef51d2c42ed2abf3e0f4db388a50795f"}, ] +[package.dependencies] +case-insensitive-dictionary = {version = "*", markers = "platform_system == \"Windows\""} + [package.extras] bestshell = ["prompt-toolkit (>=3.0.29)", "pygments (>=2.2)"] dev = ["pre-commit", "re-ver", "tomli", "xonsh[doc,test]"] -doc = ["doctr", "furo", "livereload", "matplotlib", "myst-parser", "numpydoc", "psutil", "pyzmq", "runthis-sphinxext", "sphinx (>=3.1,<5)", "tornado", "xonsh[bestshell]"] +doc = ["doctr", "furo", "livereload", "matplotlib", "myst-parser", "numpydoc", "psutil", "pyzmq", "runthis-sphinxext", "sphinx (>=3.1)", "tornado", "xonsh[bestshell]"] full = ["distro", "gnureadline", "setproctitle", "ujson", "xonsh[ptk,pygments]"] linux = ["distro"] mac = ["gnureadline"] proctitle = ["setproctitle"] ptk = ["prompt-toolkit (>=3.0.29)", "pyperclip"] pygments = ["pygments (>=2.2)"] -test = ["coverage (>=5.3.1)", "prompt-toolkit (>=3.0.29)", "pygments (>=2.2)", "pyte (>=0.8.0)", "pytest (>=7)", "pytest-cov", "pytest-mock", "pytest-rerunfailures", "pytest-subprocess", "pytest-timeout", "restructuredtext-lint", "virtualenv (>=20.16.2)", "xonsh[bestshell]"] +test = ["coverage (>=5.3.1)", "prompt-toolkit (>=3.0.29)", "pygments (>=2.2)", "pyte (>=0.8.0)", "pytest (>=7)", "pytest-cov", "pytest-mock", "pytest-rerunfailures", "pytest-subprocess", "pytest-timeout", "requests", "restructuredtext-lint", "virtualenv (>=20.16.2)", "xonsh[bestshell]"] [[package]] name = "zipp" @@ -3609,5 +3545,5 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" -python-versions = ">=3.8.1,<4" -content-hash = "ee30a55fe5338ec73a6a56ffbf1f4ae02ad218b064c5cd6a549e4103c6d5c5be" +python-versions = ">=3.9,<4" +content-hash = "e09035f2df2f648b9d8f0796bd16326ebf26d86b780c943a23990615d8e38c55" diff --git a/pyproject.toml b/pyproject.toml index 6afa1ae..9ff7126 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -23,11 +23,11 @@ exclude = [ "makim" = "makim.__main__:run_app" [tool.poetry.dependencies] -python = ">=3.8.1,<4" +python = ">=3.9,<4" sh = ">=2.0.0" pyyaml = ">=5.0" jinja2 = ">=2.0" -xonsh = ">=0.14.0" +xonsh = ">=0.15.0" python-dotenv = ">=0.21.1" typer = ">=0.9.0" fuzzywuzzy = ">=0.18.0"