From 84c773715322898fddbef457ca47b1273cc42732 Mon Sep 17 00:00:00 2001 From: rogeliolopez Date: Thu, 30 May 2024 19:54:27 -0600 Subject: [PATCH 1/4] bump-pydantic --- .github/workflows/test.yml | 6 +++--- Makefile | 2 +- requirements.txt | 2 +- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6ff81db..5c5b44d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -10,7 +10,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v2.2.1 with: - python-version: 3.8 + python-version: 3.10 - name: Install dependencies run: make install-test - name: Lint @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.7, 3.8] + python-version: [3.8, 3.8, 3.10] steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} @@ -39,7 +39,7 @@ jobs: - name: Setup Python uses: actions/setup-python@v2.2.1 with: - python-version: 3.8 + python-version: 3.10 - name: Install dependencies run: make install-test - name: Generate coverage report diff --git a/Makefile b/Makefile index d5f48fa..f54c47d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL := bash PATH := ./venv/bin:${PATH} -PYTHON = python3.7 +PYTHON = python3.10 PROJECT = clabe isort = isort $(PROJECT) tests setup.py black = black -S -l 79 --target-version py38 $(PROJECT) tests setup.py diff --git a/requirements.txt b/requirements.txt index 62c77cd..a3e7f57 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -pydantic==1.9.0 +pydantic==2.7.2 diff --git a/setup.py b/setup.py index 80d79db..c754762 100644 --- a/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ packages=setuptools.find_packages(), include_package_data=True, package_data=dict(clabe=['py.typed']), - install_requires=['pydantic>=1.4,<2.0'], + install_requires=['pydantic>=2.0,<3.0'], classifiers=[ 'Programming Language :: Python :: 3', 'License :: OSI Approved :: MIT License', From 6bd45155fa5a3aa1456ab5a9527c96e6650df886 Mon Sep 17 00:00:00 2001 From: rogeliolopez Date: Thu, 30 May 2024 19:58:12 -0600 Subject: [PATCH 2/4] version --- .github/workflows/release.yml | 9 +++++---- clabe/version.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0cda24d..948684e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,8 @@ name: release -on: push +on: + release: + types: [published] jobs: publish-pypi: @@ -8,15 +10,14 @@ jobs: steps: - uses: actions/checkout@master - name: Set up Python 3.8 - uses: actions/setup-python@v2.2.1 + uses: actions/setup-python@v4.7.0 with: - python-version: 3.8 + python-version: 3.10 - name: Install dependencies run: pip install -qU setuptools wheel twine - name: Generating distribution archives run: python setup.py sdist bdist_wheel - name: Publish distribution 📦 to PyPI - if: startsWith(github.event.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@master with: user: __token__ diff --git a/clabe/version.py b/clabe/version.py index b937dee..afced14 100644 --- a/clabe/version.py +++ b/clabe/version.py @@ -1 +1 @@ -__version__ = '1.2.13' +__version__ = '2.0.0' From c4142c318d60853f2e5804b7753d8a39caf7a6ac Mon Sep 17 00:00:00 2001 From: rogeliolopez Date: Thu, 30 May 2024 20:02:00 -0600 Subject: [PATCH 3/4] actions --- .github/workflows/licenses.yml | 6 +++--- .github/workflows/test.yml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/licenses.yml b/.github/workflows/licenses.yml index c1ea6e5..a292f69 100644 --- a/.github/workflows/licenses.yml +++ b/.github/workflows/licenses.yml @@ -15,11 +15,11 @@ jobs: PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }} PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }} steps: - - uses: actions/checkout@v2.4.0 + - uses: actions/checkout@master - name: Setup Python - uses: actions/setup-python@v2.3.1 + uses: actions/setup-python@v4.7.0 with: - python-version: 3.8 + python-version: 3.10 - name: Install and run pip-licenses run: | pip config set global.extra-index-url https://$PYPI_USERNAME:$PYPI_PASSWORD@pypi.cuenca.io:8081 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5c5b44d..20d5a73 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -6,9 +6,9 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@master - name: Set up Python - uses: actions/setup-python@v2.2.1 + uses: actions/setup-python@v4.7.0 with: python-version: 3.10 - name: Install dependencies @@ -22,9 +22,9 @@ jobs: matrix: python-version: [3.8, 3.8, 3.10] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@master - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2.2.1 + uses: actions/setup-python@v4.7.0 with: python-version: ${{ matrix.python-version }} - name: Install dependencies @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@master - name: Setup Python - uses: actions/setup-python@v2.2.1 + uses: actions/setup-python@v4.7.0 with: python-version: 3.10 - name: Install dependencies From 8a8a8a7fa334fe1502ea3377b40b1e4e19c0ff32 Mon Sep 17 00:00:00 2001 From: rogeliolopez Date: Thu, 30 May 2024 20:04:37 -0600 Subject: [PATCH 4/4] actions --- .github/workflows/test.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 20d5a73..c86ba97 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,16 +1,16 @@ name: test -on: push +on: [push, pull_request] jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Set up Python uses: actions/setup-python@v4.7.0 with: - python-version: 3.10 + python-version: 3.8 - name: Install dependencies run: make install-test - name: Lint @@ -20,9 +20,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: [3.8, 3.8, 3.10] + python-version: ['3.8', '3.9', '3.10'] steps: - - uses: actions/checkout@master + - uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4.7.0 with: @@ -39,16 +39,15 @@ jobs: - name: Setup Python uses: actions/setup-python@v4.7.0 with: - python-version: 3.10 + python-version: 3.8 - name: Install dependencies run: make install-test - name: Generate coverage report run: pytest --cov-report=xml - name: Upload coverage to Codecov - uses: codecov/codecov-action@v2.1.0 + uses: codecov/codecov-action@v3.1.4 with: file: ./coverage.xml flags: unittests name: codecov-umbrella fail_ci_if_error: true -