Updated the installation script for GitHub-release (#308)

signalfx · May 31, 2023 · 5cd3ec4 · 5cd3ec4
1 parent 952f2f7
commit 5cd3ec4
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,11 +54,14 @@ jobs:
             ~/.cache/pip
             ~/.poetry/
           key: test-cache-${{ env.RUN_MATRIX_COMBINATION }}-${{ hashFiles('poetry.lock') }}
+      - name: Fix cryptography version workaround 
+        if: ${{ matrix.python-version == 'pypy3' && matrix.os == 'ubuntu-latest' }}
+        run: pip install "cryptography>=2.0,<=40.0.2"
       - name: Install Tools 
         run: make install-tools
       - name: Test
         # pypy has some issues on github ci that we need to resolve before enabling it
-        if: ${{ matrix.python-version != 'pypy3' }}
+        if: ${{ matrix.python-version != 'pypy3' && matrix.os != 'windows' }}
         run: tox -f ${{ matrix.python-version }}-test
 
   integration:

diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ VERSION?=""
 
 .PHONY: install-poetry
 install-poetry:
-	pip install poetry==1.3.2
+	pip install poetry==1.5.1
 
 .PHONY: install-tox
 install-tox:
@@ -88,9 +88,9 @@ test-with-cov:
 	poetry run coverage report --show-missing
 	poetry run coverage xml
 
-.PHONY: create-github-release
+.PHONY: ci-create-github-release
 ci-create-github-release:
-	poetry run pip install click keepachangelog github_release
+	poetry install
 	poetry run python scripts/create_gh_release.py --dry-run=false
 
 .PHONY: prepare-release

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,6 +26,7 @@ splk-py-trace-bootstrap = 'splunk_otel.cmd.bootstrap:run_deprecated'
 splunk_distro = "splunk_otel.distro:_SplunkDistro"
 
 [tool.poetry.dependencies]
+cryptography=">=2.0,<=40.0.2"
 python = "^3.7"
 opentelemetry-api = "1.18.0"
 opentelemetry-sdk = "1.18.0"