Skip to content

Commit

Permalink
Merge branch 'main' into releases/1.2.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jlorieau committed Aug 10, 2023
2 parents b778902 + c64326c commit 293f1f0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/publish-to-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ name: Publish Python distributions to PyPI and TestPyPI

on:
push:
tags:
- '*'
branches:
- main

jobs:
build-and-publish:
Expand Down Expand Up @@ -35,5 +35,5 @@ jobs:
--outdir dist/
.
- name: Publish package distributions to PyPI
if: startsWith(github.ref, 'refs/tags')
# if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
2 changes: 1 addition & 1 deletion geomancy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from . import checks, environment

# Project version
__version__ = (1, 2, 2) # Major, minor, patch, stage
__version__ = (1, 2, 3) # Major, minor, patch, stage


def get_version(version=__version__):
Expand Down
10 changes: 5 additions & 5 deletions geomancy/entrypoints/check.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,23 @@ class MissingChecks(click.ClickException):

#: Default paths for checks files
config.cli.checks_paths = Setting(
[
(
"pyproject.toml",
".geomancy.??ml",
"geomancy.??ml",
"geomancy.yml",
".geomancy.yml",
]
)
)

#: Default file extensions for TOML files
config.cli.toml_exts = Setting([".toml"])
config.cli.toml_exts = Setting((".toml",))

#: Default file extensions for YAML files
config.cli.yaml_exts = Setting([".yml", ".yaml"])
config.cli.yaml_exts = Setting((".yml", ".yaml"))

#: Names for the config section in checks files
config.cli.config_sections = Setting(["config", "Config"])
config.cli.config_sections = Setting(("config", "Config"))


def validate_checks_files(
Expand Down

0 comments on commit 293f1f0

Please sign in to comment.