From fb484422481a795540d472da18baf37675223e3e Mon Sep 17 00:00:00 2001 From: liadomide Date: Thu, 4 Apr 2024 10:52:14 +0300 Subject: [PATCH 1/7] EBR-40 upgrade github actions versions --- .github/workflows/wheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index b40d94f..91870df 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -28,7 +28,7 @@ jobs: CIBW_ARCHS_MACOS: "x86_64,arm64" CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musl*" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: ./wheelhouse/*.whl @@ -41,7 +41,7 @@ jobs: - name: Build sdist run: pipx run build --sdist - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: dist/*.tar.gz @@ -49,7 +49,7 @@ jobs: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir From 7f1b304c6b53ee7d7376cbf6cea966199b13fa49 Mon Sep 17 00:00:00 2001 From: liadomide Date: Fri, 5 Apr 2024 23:43:09 +0300 Subject: [PATCH 2/7] EBR-40 Update copyright year --- LICENSE | 2 +- gdist.pyx | 2 +- setup.py | 2 +- tests/test_equality_with_stable.py | 2 +- tests/test_gdist.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 5d2f200..d716ab6 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ TheVirtualBrain is a brain-simulation software. See also http://www.thevirtualbrain.org -(c) 2012-2020, Baycrest Centre for Geriatric Care ("Baycrest") and others +(c) 2012-2024, Baycrest Centre for Geriatric Care ("Baycrest") and others This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either diff --git a/gdist.pyx b/gdist.pyx index 704b758..2e076fa 100644 --- a/gdist.pyx +++ b/gdist.pyx @@ -6,7 +6,7 @@ # TheVirtualBrain-Scientific Package (for simulators). See content of the # documentation-folder for more details. See also http://www.thevirtualbrain.org # -# (c) 2012-2020, Baycrest Centre for Geriatric Care ("Baycrest") and others +# (c) 2012-2024, Baycrest Centre for Geriatric Care ("Baycrest") and others # # This program is free software: you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation, diff --git a/setup.py b/setup.py index f97695b..57b1334 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ # TheVirtualBrain-Scientific Package (for simulators). See content of the # documentation-folder for more details. See also http://www.thevirtualbrain.org # -# (c) 2012-2020, Baycrest Centre for Geriatric Care ("Baycrest") and others +# (c) 2012-2024, Baycrest Centre for Geriatric Care ("Baycrest") and others # # This program is free software: you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation, diff --git a/tests/test_equality_with_stable.py b/tests/test_equality_with_stable.py index 5e5778f..d92b476 100644 --- a/tests/test_equality_with_stable.py +++ b/tests/test_equality_with_stable.py @@ -5,7 +5,7 @@ # TheVirtualBrain-Scientific Package (for simulators). See content of the # documentation-folder for more details. See also http://www.thevirtualbrain.org # -# (c) 2012-2020, Baycrest Centre for Geriatric Care ("Baycrest") and others +# (c) 2012-2024, Baycrest Centre for Geriatric Care ("Baycrest") and others # # This program is free software: you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation, diff --git a/tests/test_gdist.py b/tests/test_gdist.py index b5a1530..f2e31a7 100644 --- a/tests/test_gdist.py +++ b/tests/test_gdist.py @@ -5,7 +5,7 @@ # TheVirtualBrain-Scientific Package (for simulators). See content of the # documentation-folder for more details. See also http://www.thevirtualbrain.org # -# (c) 2012-2020, Baycrest Centre for Geriatric Care ("Baycrest") and others +# (c) 2012-2024, Baycrest Centre for Geriatric Care ("Baycrest") and others # # This program is free software: you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software Foundation, From f0425a8d0ab8d16a9c37831246827578dd58205d Mon Sep 17 00:00:00 2001 From: liadomide Date: Fri, 5 Apr 2024 23:44:12 +0300 Subject: [PATCH 3/7] EBR-40 Replace pypa/gh-action-pypi-publish with twine --- .github/workflows/wheels.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 91870df..fda1197 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,8 +1,6 @@ name: Build -on: - release: - types: [published] +on: push jobs: build_wheels: @@ -56,8 +54,11 @@ jobs: name: artifact path: dist - - uses: pypa/gh-action-pypi-publish@v1.5.0 - with: - user: ${{ secrets.PYPI_USER }} - password: ${{ secrets.PYPI_PASSWORD }} -# repository_url: https://test.pypi.org/legacy/ + - name: Release on Pypi + env: + TWINE_USERNAME: ${{ secrets.PYPI_USER }} + TWINE_PASSWORD: ${{ secrets.PYPI_PASS }} + run: | + echo "Publishing on pypi..." + python -m pip install -U twine + twine upload dist/* From b5110598abf07a6bf22227becf85816c373972dc Mon Sep 17 00:00:00 2001 From: liadomide Date: Mon, 8 Apr 2024 09:53:22 +0300 Subject: [PATCH 4/7] Revert "EBR-40 upgrade github actions versions" This reverts commit fb484422481a795540d472da18baf37675223e3e. --- .github/workflows/wheels.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index fda1197..e02694c 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -26,7 +26,7 @@ jobs: CIBW_ARCHS_MACOS: "x86_64,arm64" CIBW_SKIP: "pp* *-win32 *-manylinux_i686 *-musl*" - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl @@ -39,7 +39,7 @@ jobs: - name: Build sdist run: pipx run build --sdist - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 with: path: dist/*.tar.gz @@ -47,7 +47,7 @@ jobs: needs: [build_wheels, build_sdist] runs-on: ubuntu-latest steps: - - uses: actions/download-artifact@v4 + - uses: actions/download-artifact@v3 with: # unpacks default artifact into dist/ # if `name: artifact` is omitted, the action will create extra parent dir From f739f04987b0164b82283e85744813a8f129fe8a Mon Sep 17 00:00:00 2001 From: liadomide Date: Mon, 8 Apr 2024 11:20:49 +0300 Subject: [PATCH 5/7] EBR-40 Add --verbose flag --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index e02694c..620a70f 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -61,4 +61,4 @@ jobs: run: | echo "Publishing on pypi..." python -m pip install -U twine - twine upload dist/* + twine upload dist/* --verbose From 157324a2150466481f01225ad747bdb01d9b27a3 Mon Sep 17 00:00:00 2001 From: liadomide Date: Mon, 8 Apr 2024 14:53:28 +0300 Subject: [PATCH 6/7] EBR-40 removed fixed older version of cibuildwheel (it won't build for python 3.12) --- .github/workflows/wheels.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 620a70f..52911bc 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/setup-python@v5 - name: Install cibuildwheel - run: python -m pip install setuptools cibuildwheel==2.11.3 + run: python -m pip install setuptools cibuildwheel - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse From 47905c092ecd1834f0da9414f9d56671fcfb3c84 Mon Sep 17 00:00:00 2001 From: liadomide Date: Mon, 8 Apr 2024 15:58:35 +0300 Subject: [PATCH 7/7] EBR-40 cleanup --- .github/workflows/wheels.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml index 52911bc..8e2248b 100644 --- a/.github/workflows/wheels.yml +++ b/.github/workflows/wheels.yml @@ -1,6 +1,8 @@ name: Build -on: push +on: + release: + types: [published] jobs: build_wheels: @@ -61,4 +63,4 @@ jobs: run: | echo "Publishing on pypi..." python -m pip install -U twine - twine upload dist/* --verbose + twine upload dist/*