Skip to content

Commit

Permalink
release: v1.2.1 (#32)
Browse files Browse the repository at this point in the history
* build: prepare next bugfix release v1.2.1

* build: correct `install_requires` to be compatible with AntaREST project

* build: new bug fix release v1.2.1

* build: improve and correct GitHub actions (#28)

* build: reindent de GitHub workflow configuration files

* build: correct the `on.release.published` action to use Python 3.8 and publish on tag creation

* build: correct the `on.push.branches` to use single quoted strings

* build: prepare next bugfix release v1.2.2 (unreleased)
  • Loading branch information
laurent-laporte-pro authored Feb 24, 2023
1 parent 2839de7 commit 5896414
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# We should build a binary executable for windows-2016,
# But currently, the oldest available version is windows-2019.
# We also build a binary executable for ubuntu-20.04 for integration tests.
os: [windows-2019, ubuntu-20.04]
os: [ windows-2019, ubuntu-20.04 ]

steps:
- name: Checkout github repo (+ download lfs dependencies)
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name: Test Python 🐍 package 📦

on:
push:
branches: [ "**" ]
branches: [ '**' ]

jobs:
build:
Expand All @@ -15,19 +15,19 @@ jobs:
matrix:
# We should build a binary executable for windows-2016,
# But currently, the oldest available version is windows-2019.
os: [windows-2019, ubuntu-20.04]
python-version: ["3.8", "3.9"]
os: [ windows-2019, ubuntu-20.04 ]
python-version: [ '3.8', '3.9' ]

steps:
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -e .[test]
- name: Test with pytest
run: |
pytest
- uses: actions/checkout@v3
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v3
with:
python-version: ${{ matrix.python-version }}
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install -e .[test]
- name: Test with pytest
run: |
pytest
38 changes: 19 additions & 19 deletions .github/workflows/python-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ name: Publish Python 🐍 distributions 📦 to PyPI

on:
release:
types: [published]
types: [ published ]

permissions:
contents: read
Expand All @@ -21,21 +21,21 @@ jobs:
runs-on: ubuntu-20.04

steps:
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.x'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install build
- name: Build Python 🐍 packages
run: python -m build
- name: Publish distribution 📦 to PyPI
# Upload packages only on a tagged commit
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
- uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v3
with:
python-version: '3.8'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
python -m pip install build
- name: Build Python 🐍 packages
run: python -m build
- name: Publish distribution 📦 to PyPI
# Upload packages only on a tagged commit
if: startsWith(github.ref, 'refs/tags')
uses: pypa/gh-action-pypi-publish@release/v1
with:
user: __token__
password: ${{ secrets.PYPI_API_TOKEN }}
12 changes: 12 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog

## [1.2.2] - (unreleased)

## [1.2.1] - 2023-02-24

### Fixes

- Correct install_requires to be compatible with AntaREST project

## [1.2.0] - 2023-02-21

### Added
Expand Down Expand Up @@ -61,6 +69,10 @@
- Remove unnecessary Optional
- Enable ssh_config_file to be `None`

[1.2.2]: https://github.com/AntaresSimulatorTeam/antares-launcher/compare/v1.2.1...HEAD

[1.2.1]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.1

[1.2.0]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.2.0

[1.1.4]: https://github.com/AntaresSimulatorTeam/antares-launcher/releases/tag/v1.1.4
4 changes: 2 additions & 2 deletions antareslauncher/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

# Standard project metadata

__version__ = "1.2.0"
__version__ = "1.2.2"
__author__ = "RTE, Antares Web Team"
__date__ = "2023-02-21"
__date__ = "(unreleased)"
# noinspection SpellCheckingInspection
__credits__ = "(c) Réseau de Transport de l’Électricité (RTE)"

Expand Down
20 changes: 10 additions & 10 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
bcrypt==4.0.1
cffi==1.15.1
cryptography==39.0.1
paramiko==2.12.0
pycparser==2.21
PyNaCl==1.5.0
PyYAML==6.0
six==1.16.0
tinydb==4.7.1
tqdm==4.64.1
bcrypt~=3.2.2
cffi~=1.15.1
cryptography~=39.0.1
paramiko~=2.12.0
pycparser~=2.21
PyNaCl~=1.5.0
PyYAML~=5.4.1
six~=1.16.0
tinydb~=4.7.1
tqdm~=4.64.1
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
# Warning: this package is used as a library, so you should not constrain the versions too much.
install_requires = [
"paramiko < 3.0", # version 3.0.0 is not mature yet (2023-01-22)
"PyYAML < 6.1",
"PyYAML < 6.0", # required version for AntaREST
"tinydb < 4.8",
"tqdm < 4.65",
# frozen requirements for AntaREST:
"bcrypt~=3.2.2",
]

# Extra dependencies used for testing in "development" mode.
Expand Down

0 comments on commit 5896414

Please sign in to comment.