Skip to content

Commit

Permalink
Automatic update with PyScaffold
Browse files Browse the repository at this point in the history
  • Loading branch information
abravalheri committed Feb 7, 2022
1 parent 12272e9 commit 543c5b6
Show file tree
Hide file tree
Showing 6 changed files with 34 additions and 31 deletions.
41 changes: 23 additions & 18 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ env:
# ---- Task definitions ----

typecheck_task:
name: typecheck (Linux - 3.9)
name: typecheck (Linux - 3.10)
only_if: $TYPE_CHECKING == 'true'
clone_script: *clone
container: {image: "python:3.9-buster"} # most recent => better type support
container: {image: "python:3.10-bullseye"} # most recent => better type support
pip_cache: *pip-cache
mypy_cache:
folder: .mypy_cache
Expand All @@ -77,31 +77,35 @@ linux_mac_task:
clone_script: *clone
matrix:
- name: test (Linux - 3.6)
container: {image: "python:3.6-buster"}
container: {image: "python:3.6-bullseye"}
allow_failures: true # EoL
- name: test (Linux - 3.7)
container: {image: "python:3.7-buster"}
container: {image: "python:3.7-bullseye"}
- name: test (Linux - 3.8)
container: {image: "python:3.8-buster"}
container: {image: "python:3.8-bullseye"}
- name: test (Linux - 3.9)
container: {image: "python:3.9-buster"}
container: {image: "python:3.9-bullseye"}
- name: test (Linux - 3.10)
container: {image: "python:3.10-buster"}
container: {image: "python:3.10-bullseye"}
- name: test (Linux - 3.11)
container: {image: "python:3.11-rc-bullseye"}
allow_failures: true # Experimental
- name: test (Linux - Anaconda)
container: {image: "continuumio/anaconda3:2021.05"}
container: {image: "continuumio/anaconda3:2021.11"}
extra_install_script:
- conda install -y -c conda-forge virtualenv build setuptools setuptools-scm pip tox
- name: test (OS X)
macos_instance: {image: "big-sur-xcode"}
env:
PYTHON_VERSION: 3.7
PYTHON_VERSION: 3.9
# ^ update when the default version of python in homebrew changes
PATH: "${HOME}/.local/bin:${HOME}/Library/Python/${PYTHON_VERSION}/bin:/usr/local/opt/python/libexec/bin:${PATH}"
# ^ add user and homebrew paths
PIP_CACHE: "${HOME}/Library/Caches/pip"
brew_cache:
folder: "$HOME/Library/Caches/Homebrew"
install_script:
- brew install python gnu-tar
- brew install python
- brew cleanup
<<: *REGULAR_TASK_TEMPLATE

Expand All @@ -113,12 +117,12 @@ windows_task:
tools_cache:
folder: 'C:\tools'
fingerprint_script:
- ps: echo "$env:CIRRUS_OS - nuget v5.10.0 - git 2.32.0.2"
- ps: echo "$env:CIRRUS_OS - nuget v6.0.0 - git 2.34.1"
populate_script:
- ps: (mkdir 'C:\tools')
# ^ use parentheses to suppress errors
- ps: Invoke-WebRequest -OutFile 'C:\tools\nuget.exe' 'https://dist.nuget.org/win-x86-commandline/v5.10.0/nuget.exe'
- ps: nuget install GitForWindows -Version 2.32.0.2 -NonInteractive -OutputDirectory 'C:\tools'
- ps: Invoke-WebRequest -OutFile 'C:\tools\nuget.exe' 'https://dist.nuget.org/win-x86-commandline/v6.0.0/nuget.exe'
- ps: nuget install GitForWindows -Version 2.34.1 -NonInteractive -OutputDirectory C:\tools
workaround_git_script:
- git config --system core.longpaths true # Fix for windows git checkout problems
clone_script:
Expand All @@ -140,7 +144,7 @@ windows_task:
PYTHON_HOME: 'C:\Python'
PYTHON_APPDATA: '%APPDATA%\Python\Python38'
# ^ update when python version changes
GIT_HOME: 'C:\tools\GitForWindows.2.32.0.2\tools'
GIT_HOME: 'C:\tools\GitForWindows.2.34.1\tools'
# ^ update when git version changes
HOME: '%USERPROFILE%'
USERNAME: ContainerAdministrator
Expand Down Expand Up @@ -170,16 +174,17 @@ windows_task:


coverage_task:
name: coverage (Linux - 3.6)
name: coverage (Linux - 3.8)
clone_script: *clone
container: {image: "python:3.6-buster"}
container: {image: "python:3.8-bullseye"}
env:
COVERAGE: yes
PRE_COMMIT_HOME: ${HOME}/.cache/pre-commit
depends_on:
- test (Linux - 3.6)
- test (Linux - 3.7)
- test (Linux - 3.8)
- test (Linux - 3.9)
- test (Linux - 3.10)
- test (Linux - Anaconda)
- test (OS X)
pip_install_script:
Expand All @@ -204,7 +209,7 @@ linkcheck_task:
# only_if: $CIRRUS_BRANCH == 'master'
allow_failures: true
clone_script: *clone
container: {image: "python:3.9-buster"}
container: {image: "python:3.9-bullseye"}
depends_on:
- test (Linux - 3.9)
pip_cache: *pip-cache
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
exclude: '^docs/conf.py'

repos:
- repo: git://github.com/pre-commit/pre-commit-hooks
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
hooks:
- id: trailing-whitespace
exclude: '\.py$'
exclude: 'test_(.*)\.py$'
- id: check-added-large-files
- id: check-ast
- id: check-json
Expand All @@ -18,7 +18,7 @@ repos:
- id: mixed-line-ending
args: ['--fix=lf']

- repo: https://github.com/myint/autoflake.git
- repo: https://github.com/myint/autoflake
rev: v1.4
hooks:
- id: autoflake
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ requires = ["setuptools>=46.1.0", "setuptools_scm[toml]>=5", "wheel"]
build-backend = "setuptools.build_meta"

[tool.setuptools_scm]
# See configuration details in https://github.com/pypa/setuptools_scm
# For smarter version schemes and other configuration options,
# check out https://github.com/pypa/setuptools_scm
version_scheme = "no-guess-dev"
7 changes: 2 additions & 5 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ description = Automatically conversion of .ini/.cfg files to TOML equivalents
author = Anderson Bravalheri
author_email = andersonbravalheri@gmail.com
license = MPL-2.0
license_files = LICENSE.txt
long_description = file: README.rst
long_description_content_type = text/x-rst; charset=UTF-8
url = https://github.com/abravalheri/ini2toml/
Expand Down Expand Up @@ -118,10 +119,6 @@ testpaths = tests
# slow: mark tests as slow (deselect with '-m "not slow"')
# system: mark end-to-end system tests

[bdist_wheel]
# Use this option if your package is pure-python
universal = 1

[devpi:upload]
# Options for the devpi: PyPI server and packaging tool
# VCS export must be deactivated since we are using setuptools-scm
Expand Down Expand Up @@ -155,7 +152,7 @@ warn_unused_ignores = True
[pyscaffold]
# PyScaffold's parameters when the project was created.
# This will be used when updating. Do not change!
version = 4.1
version = 4.1.4
package = ini2toml
extensions =
cirrus
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Setup file for ini2toml.
Use setup.cfg to configure your project.
This file was generated with PyScaffold 4.1rc1.post1.dev19+g4c2abfd.
This file was generated with PyScaffold 4.1.4.
PyScaffold helps you to put up the scaffold of your new Python project.
Learn more under: https://pyscaffold.org/
"""
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Tox configuration file
# Read more under https://tox.readthedocs.io/
# Read more under https://tox.wiki/
# THIS SCRIPT IS SUPPOSED TO BE AN EXAMPLE. MODIFY IT ACCORDING TO YOUR NEEDS!

[tox]
Expand Down Expand Up @@ -43,15 +43,15 @@ description =
build: Build the package in isolation according to PEP517, see https://github.com/pypa/build
clean: Remove old distribution files and temporary build artifacts (./build and ./dist)
# NOTE: build is still experimental, please refer to the links for updates/issues
# https://setuptools.pypa.io/en/latest/build_meta.html#how-to-use-it
# https://setuptools.pypa.io/en/stable/build_meta.html#how-to-use-it
# https://github.com/pypa/pep517/issues/91
skip_install = True
changedir = {toxinidir}
deps =
build: build[virtualenv]
commands =
clean: python -c 'from shutil import rmtree; rmtree("build", True); rmtree("dist", True)'
build: python -m build .
build: python -m build {posargs}
# By default `build` produces wheels, you can also explicitly use the flags `--sdist` and `--wheel`


Expand Down

0 comments on commit 543c5b6

Please sign in to comment.