From 4c32bb10bb6cba3d68f21a1c42ffe211cb59a4a3 Mon Sep 17 00:00:00 2001 From: Josenilson Ferreira da Silva <nilsonfsilva@hotmail.com> Date: Sat, 25 May 2024 00:27:13 -0300 Subject: [PATCH] New upstream version 0.1.1 --- .bumpversion.cfg | 2 +- .github/workflows/conda_ci.yml | 4 +-- .github/workflows/python_ci.yml | 4 +-- .github/workflows/python_ci_linux.yml | 6 ++-- .github/workflows/python_ci_macos.yml | 8 ++--- .pre-commit-config.yaml | 4 +-- README.rst | 2 +- doc-source/conf.py | 6 ++++ doc-source/index.rst | 2 +- formate.toml | 16 +++++----- pyproject.toml | 45 +++++++++++++-------------- repo_helper.yml | 2 +- setup.cfg | 2 +- tox.ini | 4 ++- whey/__init__.py | 2 +- 15 files changed, 57 insertions(+), 52 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 64fde96..1f3cb79 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.0 +current_version = 0.1.1 commit = True tag = True diff --git a/.github/workflows/conda_ci.yml b/.github/workflows/conda_ci.yml index 33f6827..0d78ef9 100644 --- a/.github/workflows/conda_ci.yml +++ b/.github/workflows/conda_ci.yml @@ -39,7 +39,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "whey-conda" "setuptools!=61.*,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "whey-conda" "setuptools!=61.*,<=67.1.0,>=40.6.0" "wheel>=0.34.2" # $CONDA is an environment variable pointing to the root of the miniconda directory $CONDA/bin/conda update -n base conda $CONDA/bin/conda config --add channels conda-forge @@ -57,7 +57,7 @@ jobs: - name: "Install package" run: | - $CONDA/bin/conda install -c file://$(pwd)/conda-bld whey=0.1.0=py_1 -y || exit 1 + $CONDA/bin/conda install -c file://$(pwd)/conda-bld whey=0.1.1=py_1 -y || exit 1 - name: "Run Tests" run: | diff --git a/.github/workflows/python_ci.yml b/.github/workflows/python_ci.yml index e1544dc..fb0f9fe 100644 --- a/.github/workflows/python_ci.yml +++ b/.github/workflows/python_ci.yml @@ -22,7 +22,7 @@ jobs: runs-on: "windows-2019" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} diff --git a/.github/workflows/python_ci_linux.yml b/.github/workflows/python_ci_linux.yml index 301a607..5fe7b75 100644 --- a/.github/workflows/python_ci_linux.yml +++ b/.github/workflows/python_ci_linux.yml @@ -23,7 +23,7 @@ jobs: runs-on: "ubuntu-20.04" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.6,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -36,7 +36,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.6", testenvs: "pypy36,build", experimental: False} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} @@ -203,7 +203,7 @@ jobs: python -VV python -m site python -m pip install --upgrade pip setuptools wheel - python -m pip install --upgrade "mkrecipe" "setuptools!=61.*,>=40.6.0" "wheel>=0.34.2" + python -m pip install --upgrade "mkrecipe" "setuptools!=61.*,<=67.1.0,>=40.6.0" "wheel>=0.34.2" # $CONDA is an environment variable pointing to the root of the miniconda directory $CONDA/bin/conda config --set always_yes yes --set changeps1 no $CONDA/bin/conda update -n base conda diff --git a/.github/workflows/python_ci_macos.yml b/.github/workflows/python_ci_macos.yml index dfb2494..1929c7c 100644 --- a/.github/workflows/python_ci_macos.yml +++ b/.github/workflows/python_ci_macos.yml @@ -18,11 +18,11 @@ permissions: jobs: tests: - name: "macos-latest / Python ${{ matrix.config.python-version }}" - runs-on: "macos-latest" + name: "macos-13 / Python ${{ matrix.config.python-version }}" + runs-on: "macos-13" continue-on-error: ${{ matrix.config.experimental }} env: - USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-alpha.5,pypy-3.7,pypy-3.8,pypy-3.9' + USING_COVERAGE: '3.6,3.7,3.8,3.9,3.10,3.11,3.12,3.13.0-beta.1,pypy-3.7,pypy-3.8,pypy-3.9' strategy: fail-fast: False @@ -35,7 +35,7 @@ jobs: - {python-version: "3.10", testenvs: "py310,build", experimental: False} - {python-version: "3.11", testenvs: "py311,build", experimental: False} - {python-version: "3.12", testenvs: "py312,build", experimental: False} - - {python-version: "3.13.0-alpha.5", testenvs: "py313-dev,build", experimental: True} + - {python-version: "3.13.0-beta.1", testenvs: "py313-dev,build", experimental: True} - {python-version: "pypy-3.7", testenvs: "pypy37,build", experimental: False} - {python-version: "pypy-3.8", testenvs: "pypy38,build", experimental: False} - {python-version: "pypy-3.9", testenvs: "pypy39,build", experimental: True} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bed3220..8813d72 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -8,7 +8,7 @@ ci: repos: - repo: https://github.com/repo-helper/pyproject-parser - rev: v0.9.1 + rev: v0.11.0 hooks: - id: reformat-pyproject @@ -43,7 +43,7 @@ repos: - id: bind-requirements - repo: https://github.com/domdfcoding/flake8-dunder-all - rev: v0.3.1 + rev: v0.4.1 hooks: - id: ensure-dunder-all files: ^whey/.*\.py$ diff --git a/README.rst b/README.rst index d5938ab..0a3797c 100644 --- a/README.rst +++ b/README.rst @@ -119,7 +119,7 @@ See `the documentation`_ for configuration_ and usage_ information. .. |language| image:: https://img.shields.io/github/languages/top/repo-helper/whey :alt: GitHub top language -.. |commits-since| image:: https://img.shields.io/github/commits-since/repo-helper/whey/v0.1.0 +.. |commits-since| image:: https://img.shields.io/github/commits-since/repo-helper/whey/v0.1.1 :target: https://github.com/repo-helper/whey/pulse :alt: GitHub commits since tagged version diff --git a/doc-source/conf.py b/doc-source/conf.py index 04e5adb..76ae8ff 100644 --- a/doc-source/conf.py +++ b/doc-source/conf.py @@ -74,8 +74,14 @@ latex_elements = { def setup(app): # 3rd party from sphinx_toolbox.latex import better_header_layout + from sphinxemoji import sphinxemoji app.connect("config-inited", lambda app, config: better_header_layout(config)) + app.connect("build-finished", sphinxemoji.copy_asset_files) + app.add_js_file("https://unpkg.com/twemoji@latest/dist/twemoji.min.js") + app.add_js_file("twemoji.js") + app.add_css_file("twemoji.css") + app.add_transform(sphinxemoji.EmojiSubstitutions) nitpicky = True diff --git a/doc-source/index.rst b/doc-source/index.rst index 78de01c..8bd50e4 100644 --- a/doc-source/index.rst +++ b/doc-source/index.rst @@ -135,7 +135,7 @@ whey :alt: GitHub top language .. |commits-since| github-shield:: - :commits-since: v0.1.0 + :commits-since: v0.1.1 :alt: GitHub commits since tagged version .. |commits-latest| github-shield:: diff --git a/formate.toml b/formate.toml index 01dfba9..f752b9e 100644 --- a/formate.toml +++ b/formate.toml @@ -6,21 +6,17 @@ noqa-reformat = 60 ellipsis-reformat = 70 squish_stubs = 80 -[config] -indent = "\t" -line_length = 115 - [hooks.yapf] priority = 30 -[hooks.isort] -priority = 50 - [hooks.yapf.kwargs] yapf_style = ".style.yapf" +[hooks.isort] +priority = 50 + [hooks.isort.kwargs] -indent = "\t\t" +indent = " " multi_line_output = 8 import_heading_stdlib = "stdlib" import_heading_thirdparty = "3rd party" @@ -64,3 +60,7 @@ known_third_party = [ "whey_pth", ] known_first_party = [ "whey",] + +[config] +indent = " " +line_length = 115 diff --git a/pyproject.toml b/pyproject.toml index e2ce860..f6143a0 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,10 +1,10 @@ [build-system] -requires = [ "setuptools!=61.*,>=40.6.0", "wheel>=0.34.2",] +requires = [ "setuptools!=61.*,<=67.1.0,>=40.6.0", "wheel>=0.34.2",] build-backend = "setuptools.build_meta" [project] name = "whey" -version = "0.1.0" +version = "0.1.1" description = "A simple Python wheel builder for simple projects." readme = "README.rst" requires-python = ">=3.6.1" @@ -33,14 +33,13 @@ classifiers = [ ] dynamic = [ "dependencies",] +[project.license] +file = "LICENSE" + [[project.authors]] name = "Dominic Davis-Foster" email = "dominic@davis-foster.co.uk" - -[project.license] -file = "LICENSE" - [project.urls] Homepage = "https://github.com/repo-helper/whey" "Issue Tracker" = "https://github.com/repo-helper/whey/issues" @@ -50,6 +49,10 @@ Documentation = "https://whey.readthedocs.io/en/latest" [project.scripts] whey = "whey.__main__:main" +[project.entry-points."whey.builder"] +whey_sdist = "whey.builder:SDistBuilder" +whey_wheel = "whey.builder:WheelBuilder" + [project.optional-dependencies] readme = [ "docutils>=0.16", "pyproject-parser[readme]>=0.11.0b1",] editable = [ "editables>=0.2",] @@ -81,7 +84,6 @@ extensions = [ "sphinx.ext.mathjax", "sphinxcontrib.extras_require", "sphinx.ext.todo", - "sphinxemoji.sphinxemoji", "notfound.extension", "sphinx_copybutton", "sphinxcontrib.default_values", @@ -96,7 +98,6 @@ extensions = [ "attr_utils.autoattrs", "local_extension", ] -sphinxemoji_style = "twemoji" gitstamp_fmt = "%d %b %Y" templates_path = [ "_templates",] html_static_path = [ "_static",] @@ -171,15 +172,23 @@ show_error_codes = true [tool.snippet-fmt] directives = [ "code-block",] +[tool.snippet-fmt.languages.python] +reformat = true + +[tool.snippet-fmt.languages.toml] + +[tool.snippet-fmt.languages.TOML] +reformat = true + +[tool.snippet-fmt.languages.ini] + +[tool.snippet-fmt.languages.json] + [tool.setuptools] zip-safe = false include-package-data = true platforms = [ "Windows", "macOS", "Linux",] -[project.entry-points."whey.builder"] -whey_sdist = "whey.builder:SDistBuilder" -whey_wheel = "whey.builder:WheelBuilder" - [tool.dependency-dash."requirements.txt"] order = 10 @@ -193,15 +202,3 @@ include = false [tool.dep_checker.name_mapping] attrs = "attr" - -[tool.snippet-fmt.languages.python] -reformat = true - -[tool.snippet-fmt.languages.toml] - -[tool.snippet-fmt.languages.TOML] -reformat = true - -[tool.snippet-fmt.languages.ini] - -[tool.snippet-fmt.languages.json] diff --git a/repo_helper.yml b/repo_helper.yml index 82ef9fb..d519073 100644 --- a/repo_helper.yml +++ b/repo_helper.yml @@ -7,7 +7,7 @@ email: 'dominic@davis-foster.co.uk' username: 'repo-helper' assignee: 'domdfcoding' primary_conda_channel: "domdfcoding" -version: '0.1.0' +version: '0.1.1' license: 'MIT' short_desc: 'A simple Python wheel builder for simple projects.' diff --git a/setup.cfg b/setup.cfg index 68c8851..e27c16f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -8,7 +8,7 @@ [metadata] name = whey -version = 0.1.0 +version = 0.1.1 author = Dominic Davis-Foster author_email = dominic@davis-foster.co.uk license = MIT License diff --git a/tox.ini b/tox.ini index 6f2b6ac..ef1b3f7 100644 --- a/tox.ini +++ b/tox.ini @@ -81,6 +81,7 @@ setenv = setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 [testenv:py312] setenv = @@ -101,6 +102,7 @@ setenv = PYTHONDEVMODE=1 PIP_DISABLE_PIP_VERSION_CHECK=1 PIP_PREFER_BINARY=1 + UNSAFE_PYO3_SKIP_VERSION_CHECK=1 skip_install = True changedir = {toxinidir} deps = @@ -128,7 +130,7 @@ deps = flake8-github-actions>=0.1.0 flake8-noqa>=1.1.0,<=1.2.2 flake8-pyi>=20.10.0,<=22.8.0 - flake8-pytest-style>=1.3.0 + flake8-pytest-style>=1.3.0,<2 flake8-quotes>=3.3.0 flake8-slots>=0.1.0 flake8-sphinx-links>=0.0.4 diff --git a/whey/__init__.py b/whey/__init__.py index ed59026..41dda3f 100644 --- a/whey/__init__.py +++ b/whey/__init__.py @@ -32,7 +32,7 @@ import os __author__: str = "Dominic Davis-Foster" __copyright__: str = "2021 Dominic Davis-Foster" __license__: str = "MIT License" -__version__: str = "0.1.0" +__version__: str = "0.1.1" __email__: str = "dominic@davis-foster.co.uk" __all__ = ("build_sdist", "build_wheel") -- GitLab