Skip to content

Commit 03f18fa

Browse files
committed
Merge branch 'main' into typing
2 parents acce7a8 + 6f2a3d2 commit 03f18fa

27 files changed

+829
-799
lines changed

.conda/meta.yaml

Lines changed: 0 additions & 48 deletions
This file was deleted.

.coveragerc

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[report]
2+
exclude_lines =
3+
pragma: no cover
4+
if TYPE_CHECKING.*:
5+
\.\.\.

.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ Provide a description and/or bullet points to describe the changes in this PR.
66

77
- [ ] Reference issues which can be closed due to this PR with "Closes #x".
88
- [ ] Review whether the documentation needs to be updated.
9-
- [ ] Document PR in docs/changes.rst.
9+
- [ ] Document PR in CHANGES.md.

.github/workflows/continuous-integration-workflow.yml renamed to .github/workflows/main.yml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Continuous Integration Workflow
1+
name: main
22

33
# Automatically cancel a previous run.
44
concurrency:
@@ -48,15 +48,6 @@ jobs:
4848
shell: bash -l {0}
4949
run: bash <(curl -s https://codecov.io/bash) -F unit -c
5050

51-
# - name: Run integration tests.
52-
# shell: bash -l {0}
53-
# run: tox -e pytest -- -m integration --cov=./ --cov-report=xml -n auto
54-
55-
# - name: Upload coverage reports of integration tests.
56-
# if: runner.os == 'Linux' && matrix.python-version == '3.8'
57-
# shell: bash -l {0}
58-
# run: bash <(curl -s https://codecov.io/bash) -F integration -c
59-
6051
- name: Run end-to-end tests.
6152
shell: bash -l {0}
6253
run: tox -e pytest -- -m end_to_end --cov=./ --cov-report=xml -n auto

.pre-commit-config.yaml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v4.1.0
3+
rev: v4.2.0
44
hooks:
55
- id: check-added-large-files
66
args: ['--maxkb=25']
77
- id: check-case-conflict
88
- id: check-merge-conflict
99
- id: check-vcs-permalinks
1010
- id: check-yaml
11-
exclude: meta.yaml
1211
- id: debug-statements
1312
- id: end-of-file-fixer
1413
- id: fix-byte-order-marker
@@ -24,33 +23,25 @@ repos:
2423
- id: python-no-eval
2524
- id: python-no-log-warn
2625
- id: python-use-type-annotations
27-
- id: rst-backticks
28-
- id: rst-directive-colons
29-
- id: rst-inline-touching-normal
3026
- id: text-unicode-replacement-char
3127
- repo: https://github.com/asottile/pyupgrade
32-
rev: v2.31.0
28+
rev: v2.32.0
3329
hooks:
3430
- id: pyupgrade
3531
args: [--py37-plus]
3632
- repo: https://github.com/asottile/reorder_python_imports
37-
rev: v2.7.1
33+
rev: v3.0.1
3834
hooks:
3935
- id: reorder-python-imports
4036
args: [--py37-plus, --add-import, 'from __future__ import annotations']
4137
- repo: https://github.com/asottile/setup-cfg-fmt
42-
rev: v1.20.0
38+
rev: v1.20.1
4339
hooks:
4440
- id: setup-cfg-fmt
4541
- repo: https://github.com/psf/black
46-
rev: 22.1.0
42+
rev: 22.3.0
4743
hooks:
4844
- id: black
49-
- repo: https://github.com/asottile/blacken-docs
50-
rev: v1.12.1
51-
hooks:
52-
- id: blacken-docs
53-
additional_dependencies: [black]
5445
- repo: https://github.com/PyCQA/flake8
5546
rev: 4.0.1
5647
hooks:
@@ -72,10 +63,6 @@ repos:
7263
pydocstyle,
7364
Pygments,
7465
]
75-
- repo: https://github.com/PyCQA/doc8
76-
rev: 0.10.1
77-
hooks:
78-
- id: doc8
7966
- repo: https://github.com/econchick/interrogate
8067
rev: 1.5.0
8168
hooks:
@@ -85,7 +72,6 @@ repos:
8572
rev: v2.1.0
8673
hooks:
8774
- id: codespell
88-
args: [-L unparseable]
8975
- repo: https://github.com/pre-commit/mirrors-mypy
9076
rev: 'v0.931'
9177
hooks:
@@ -95,16 +81,18 @@ repos:
9581
--ignore-missing-imports,
9682
]
9783
additional_dependencies: [
98-
types-attrs,
99-
types-click,
84+
attrs,
85+
click,
10086
types-setuptools
10187
]
10288
pass_filenames: false
10389
language_version: "3.9"
10490
- repo: https://github.com/mgedmin/check-manifest
105-
rev: "0.47"
91+
rev: "0.48"
10692
hooks:
10793
- id: check-manifest
94+
args: [--no-build-isolation]
95+
additional_dependencies: [setuptools-scm, toml]
10896
- repo: meta
10997
hooks:
11098
- id: check-hooks-apply

CHANGES.md

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Changes
2+
3+
This is a record of all past pytask-stata releases and what went into
4+
them in reverse chronological order. Releases follow [semantic
5+
versioning](https://semver.org/) and all releases are available on
6+
[PyPI](https://pypi.org/project/pytask-stata) and
7+
[Anaconda.org](https://anaconda.org/conda-forge/pytask-stata).
8+
9+
## 0.2.0 - 2022-xx-xx
10+
11+
- {pull}`20` removes an unnecessary hook implementation.
12+
13+
## 0.1.2 - 2022-02-08
14+
15+
- {pull}`19` fixes the minimum python and
16+
pytask version.
17+
18+
## 0.1.1 - 2022-02-07
19+
20+
- {pull}`16` skips concurrent CI builds.
21+
- {pull}`17` deprecates Python 3.6 and adds
22+
support for Python 3.10.
23+
24+
## 0.1.0 - 2021-07-21
25+
26+
- {pull}`11` fixes the `README.rst`.
27+
- {pull}`13` replaces versioneer with
28+
setuptools-scm.
29+
- {pull}`14` fixes tests and aligns
30+
pytask-stata with pytask v0.1.0.
31+
32+
## 0.0.6 - 2021-03-05
33+
34+
- {pull}`10` fixes the version of the package.
35+
36+
## 0.0.5 - 2021-03-04
37+
38+
- {pull}`7` fix some post-release issues.
39+
- {pull}`9` adds dependencies to `setup.py`.
40+
41+
## 0.0.4 - 2021-02-25
42+
43+
- {pull}`6` prepares pytask-stata to be
44+
published on PyPI, adds versioneer and more.
45+
46+
## 0.0.3 - 2021-01-16
47+
48+
- {pull}`4` removes log file handling on UNIX
49+
and raises an error if run in parallel.
50+
51+
## 0.0.2 - 2020-10-30
52+
53+
- {pull}`1` makes pytask-stata work with pytask
54+
v0.0.9.
55+
56+
## 0.0.1 - 2020-10-04
57+
58+
- Release v0.0.1.

CHANGES.rst

Lines changed: 0 additions & 58 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright 2020-2021 Tobias Raabe
1+
Copyright 2020 Tobias Raabe
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy of this
44
software and associated documentation files (the "Software"), to deal in the Software

MANIFEST.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
prune .conda
21
prune tests
32

4-
exclude *.rst
3+
exclude .coveragerc
4+
exclude *.md
55
exclude *.yml
66
exclude *.yaml
77
exclude tox.ini
88

9-
include README.rst
9+
include README.md
1010
include LICENSE
11-
include versioneer.py
12-
include src/pytask_stata/_version.py

0 commit comments

Comments
 (0)