Skip to content

Commit 1660ca7

Browse files
authored
Merge branch 'main' into type/pandas
2 parents b4a35ac + 94cad5f commit 1660ca7

File tree

2 files changed

+13
-50
lines changed

2 files changed

+13
-50
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -63,48 +63,12 @@ jobs:
6363
6464
- run: pip freeze
6565

66-
- run: mkdir coverage
67-
6866
- run: make test
6967
env:
70-
COVERAGE_FILE: coverage/.coverage.${{ runner.os }}-py${{ matrix.python-version }}-with-deps
7168
CONTEXT: ${{ runner.os }}-py${{ matrix.python-version }}-with-deps
7269

73-
- name: store coverage files
74-
uses: actions/upload-artifact@v3
75-
with:
76-
name: coverage
77-
path: coverage
78-
79-
coverage-combine:
80-
needs: [test]
81-
runs-on: ubuntu-latest
82-
83-
steps:
84-
- uses: actions/checkout@v3
85-
86-
- uses: actions/setup-python@v4
87-
with:
88-
python-version: '3.8'
89-
90-
- name: get coverage files
91-
uses: actions/download-artifact@v3
92-
with:
93-
name: coverage
94-
path: coverage
95-
96-
- run: pip install coverage[toml]
97-
98-
- run: ls -la coverage
99-
- run: coverage combine coverage
100-
- run: coverage report
101-
- run: coverage html --show-contexts --title "pydantic coverage for ${{ github.sha }}"
102-
103-
- name: Store coverage html
104-
uses: actions/upload-artifact@v3
105-
with:
106-
name: coverage-html
107-
path: htmlcov
70+
- run: coverage xml
71+
- uses: codecov/codecov-action@v3
10872

10973
# https://github.com/marketplace/actions/alls-green#why used for branch protection checks
11074
check:
@@ -117,11 +81,15 @@ jobs:
11781
with:
11882
jobs: ${{ toJSON(needs) }}
11983

120-
deploy:
121-
name: Deploy
84+
release:
85+
name: Release
12286
needs: [check]
12387
if: "success() && startsWith(github.ref, 'refs/tags/')"
12488
runs-on: ubuntu-latest
89+
environment: release
90+
91+
permissions:
92+
id-token: write
12593

12694
steps:
12795
- uses: actions/checkout@v2
@@ -132,20 +100,15 @@ jobs:
132100
python-version: '3.10'
133101

134102
- name: install
135-
run: pip install -U twine build
103+
run: pip install -U build
136104

137105
- name: check GITHUB_REF matches package version
138-
uses: samuelcolvin/check-python-version@v3
106+
uses: samuelcolvin/check-python-version@v3.1
139107
with:
140108
version_file_path: pydantic_extra_types/__init__.py
141109

142110
- name: build
143111
run: python -m build
144112

145-
- run: twine check --strict dist/*
146-
147-
- name: upload to pypi
148-
run: twine upload dist/*
149-
env:
150-
TWINE_USERNAME: __token__
151-
TWINE_PASSWORD: ${{ secrets.pypi_token }}
113+
- name: Upload package to PyPI
114+
uses: pypa/gh-action-pypi-publish@release/v1

pydantic_extra_types/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.0.1'
1+
__version__ = '2.0.0'

0 commit comments

Comments
 (0)