From 2d92a9819443478a1869baa921450ae5fa8075ed Mon Sep 17 00:00:00 2001 From: Nikita Beletskii Date: Thu, 27 Oct 2022 15:35:05 +0200 Subject: [PATCH 1/4] fix ci and add CHANGELOG.me --- .github/workflows/main.yml | 24 ++++++++---------------- CHANGELOG.md | 5 +++++ requirements-dev-py27.txt | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 CHANGELOG.md diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f5414a3..33f5597 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,14 +39,14 @@ jobs: NOMAD_VERSION: ${{ matrix.nomad-version }} shell: bash run: | - echo $NOMAD_VERSION - echo ${NOMAD_VERSION} + echo $NOMAD_VERSION + echo ${NOMAD_VERSION} - echo "downloading nomad" - curl -L -o /tmp/nomad_${NOMAD_VERSION}_linux_amd64.zip https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_amd64.zip + echo "downloading nomad" + curl -L -o /tmp/nomad_${NOMAD_VERSION}_linux_amd64.zip https://releases.hashicorp.com/nomad/${NOMAD_VERSION}/nomad_${NOMAD_VERSION}_linux_amd64.zip - echo "unzip nomad" - unzip -d /tmp /tmp/nomad_${NOMAD_VERSION}_linux_amd64.zip + echo "unzip nomad" + unzip -d /tmp /tmp/nomad_${NOMAD_VERSION}_linux_amd64.zip echo "starting nomad server" /tmp/nomad agent -dev -bind ${NOMAD_IP} -node pynomad1 --acl-enabled > /dev/null 2>&1 & @@ -58,9 +58,8 @@ jobs: run: | python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - if [ $PYTHON_VERSION = "2.7" ] - then - pip install -r requirements-dev-py27.txt + if [ $PYTHON_VERSION = "2.7" ] then + pip install -r requirements-dev-py27.txt else pip install -r requirements-dev.txt fi @@ -82,13 +81,6 @@ jobs: run: | python -m pip install build python -m build --sdist --wheel - - name: Publish Test PyPi - uses: pypa/gh-action-pypi-publish@release/v1 - with: - user: __token__ - password: ${{ secrets.TEST_PYPI_API_TOKEN }} - repository_url: https://test.pypi.org/legacy/ - skip_existing: true - name: Publish/Release Package if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') uses: pypa/gh-action-pypi-publish@release/v1 diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..a43d1b7 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,5 @@ +## Unreleased +* Add `namespace` agrument support for `get_allocations` and `get_deployments` endpoints (#133) +* Add Python 3.10 support (#133) +* Add support for pre-populated Sessions (#132) +* Add scaling policy endpoint (#136) diff --git a/requirements-dev-py27.txt b/requirements-dev-py27.txt index a961256..21de22f 100644 --- a/requirements-dev-py27.txt +++ b/requirements-dev-py27.txt @@ -1,7 +1,7 @@ coverage==5.2.1 pytest==4.6.11 pytest-cov==2.12.1 -mkdocs==1.2.3 +mkdocs==1.0.4 mock==1.2.0 flaky==3.7.0 responses==0.13.4 From 541c192550a2e9910c312090d8eb7497ffdb86b1 Mon Sep 17 00:00:00 2001 From: Nikita Beletskii Date: Thu, 27 Oct 2022 17:14:02 +0200 Subject: [PATCH 2/4] fix syntax --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33f5597..552a62c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: run: | python -m pip install --upgrade pip if [ -f requirements.txt ]; then pip install -r requirements.txt; fi - if [ $PYTHON_VERSION = "2.7" ] then + if [ $PYTHON_VERSION = "2.7" ]; then pip install -r requirements-dev-py27.txt else pip install -r requirements-dev.txt From 3f6cda3dd28422bc83cce31b13d1614f13c7b395 Mon Sep 17 00:00:00 2001 From: Nikita Beletskii Date: Thu, 27 Oct 2022 17:27:14 +0200 Subject: [PATCH 3/4] try to upgrade actions --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 552a62c..af49d7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,9 +29,9 @@ jobs: nomad-version: ['1.0.0', '1.1.18'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Setup Nomad ${{ matrix.nomad-version }} From b0632ae1fe5850e9727dcbb02c7d857b9fd0295b Mon Sep 17 00:00:00 2001 From: Nikita Beletskii Date: Sat, 29 Oct 2022 17:33:10 +0200 Subject: [PATCH 4/4] add more Nomad versions --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af49d7a..99f5e25 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,8 +26,7 @@ jobs: fail-fast: false matrix: python-version: ['2.7', '3.7', '3.10'] - nomad-version: ['1.0.0', '1.1.18'] - + nomad-version: ['1.0.18', '1.1.18', '1.2.14', '1.3.7', '1.4.2'] steps: - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }}