Skip to content

Commit

Permalink
Merge pull request #23 from matthiasdiener/flake8-v6-patch
Browse files Browse the repository at this point in the history
add gh-111 patch
  • Loading branch information
dopplershift committed Nov 29, 2022
2 parents c640673 + 16a4125 commit b4cc19f
Show file tree
Hide file tree
Showing 5 changed files with 43 additions and 3 deletions.
6 changes: 6 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,9 @@ channel_targets:
- conda-forge main
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
pin_run_as_build:
python:
min_pin: x.x
max_pin: x.x
python:
- 3.10.* *_cpython
2 changes: 1 addition & 1 deletion .github/CODEOWNERS

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

1 change: 1 addition & 0 deletions README.md

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

28 changes: 28 additions & 0 deletions recipe/111.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/flake8_quotes/__init__.py b/flake8_quotes/__init__.py
index 3113d7c..7344e3d 100644
--- a/flake8_quotes/__init__.py
+++ b/flake8_quotes/__init__.py
@@ -107,19 +107,19 @@ def _register_opt(parser, *args, **kwargs):
@classmethod
def add_options(cls, parser):
cls._register_opt(parser, '--quotes', action='store',
- parse_from_config=True, type='choice',
+ parse_from_config=True,
choices=sorted(cls.INLINE_QUOTES.keys()),
help='Deprecated alias for `--inline-quotes`')
cls._register_opt(parser, '--inline-quotes', default="'",
- action='store', parse_from_config=True, type='choice',
+ action='store', parse_from_config=True,
choices=sorted(cls.INLINE_QUOTES.keys()),
help="Quote to expect in all files (default: ')")
cls._register_opt(parser, '--multiline-quotes', default=None, action='store',
- parse_from_config=True, type='choice',
+ parse_from_config=True,
choices=sorted(cls.MULTILINE_QUOTES.keys()),
help='Quote to expect in all files (default: """)')
cls._register_opt(parser, '--docstring-quotes', default=None, action='store',
- parse_from_config=True, type='choice',
+ parse_from_config=True,
choices=sorted(cls.DOCSTRING_QUOTES.keys()),
help='Quote to expect in all files (default: """)')
cls._register_opt(parser, '--avoid-escape', default=None, action='store_true',
9 changes: 7 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@ source:
fn: {{ name }}-{{ version }}.tar.gz
url: https://pypi.io/packages/source/{{ name[0] }}/{{ name }}/{{ name }}-{{ version }}.tar.gz
sha256: {{ sha256 }}
patches:
- 111.diff

build:
noarch: python
number: 1
number: 2
script: {{ PYTHON }} -m pip install . --no-deps -vv

requirements:
Expand All @@ -23,11 +25,13 @@ requirements:
- setuptools
run:
- python >=3.5
- flake8 <6
- flake8

test:
imports:
- flake8_quotes
commands:
- flake8 --version

about:
home: https://github.com/zheller/flake8-quotes
Expand All @@ -46,3 +50,4 @@ extra:
- flamingbear
- michaeljb
- dopplershift
- matthiasdiener

1 comment on commit b4cc19f

@conda-forge-linter
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! This is the friendly automated conda-forge-webservice.

I updated the Github team because of this commit.

You should get push access to this feedstock and CI services.

Your package won't be available for installation locally until it is built
and synced to the anaconda.org CDN (takes 1-2 hours after the build finishes).

Feel free to join the community chat room.

NOTE: Please make sure to not push to the repository directly.
Use branches in your fork for any changes and send a PR.
More details on this are here.

Please sign in to comment.