From 5cd3ec42ad61a42ab3667c0bcbb0d93d85702f2a Mon Sep 17 00:00:00 2001
From: Nina Stawski <nstawski@splunk.com>
Date: Wed, 31 May 2023 16:17:30 -0700
Subject: [PATCH] Updated the installation script for GitHub-release (#308)

---
 .github/workflows/ci.yml |  5 +++-
 Makefile                 |  6 ++---
 poetry.lock              | 53 ++++++++++++++++++++++++++++++++++++----
 pyproject.toml           |  1 +
 4 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 648f8c96..26998a4e 100644
--- 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
index bef64e68..180fffb8 100644
--- 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
index 28c20ea2..c0cd622d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -73,6 +73,17 @@ category = "dev"
 optional = false
 python-versions = ">=3.6"
 
+[[package]]
+name = "cffi"
+version = "1.15.1"
+description = "Foreign Function Interface for Python calling C code."
+category = "main"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+pycparser = "*"
+
 [[package]]
 name = "charset-normalizer"
 version = "3.1.0"
@@ -112,9 +123,30 @@ python-versions = ">=3.6"
 [package.extras]
 toml = ["tomli"]
 
+[[package]]
+name = "cryptography"
+version = "40.0.2"
+description = "cryptography is a package which provides cryptographic recipes and primitives to Python developers."
+category = "main"
+optional = false
+python-versions = ">=3.6"
+
+[package.dependencies]
+cffi = ">=1.12"
+
+[package.extras]
+docs = ["sphinx (>=5.3.0)", "sphinx-rtd-theme (>=1.1.1)"]
+docstest = ["pyenchant (>=1.6.11)", "twine (>=1.12.0)", "sphinxcontrib-spelling (>=4.0.1)"]
+pep8test = ["black", "ruff", "mypy", "check-manifest"]
+sdist = ["setuptools-rust (>=0.11.4)"]
+ssh = ["bcrypt (>=3.1.5)"]
+test = ["pytest (>=6.2.0)", "pytest-shard (>=0.1.2)", "pytest-benchmark", "pytest-cov", "pytest-subtests", "pytest-xdist", "pretend", "iso8601"]
+test-randomorder = ["pytest-randomly"]
+tox = ["tox"]
+
 [[package]]
 name = "deprecated"
-version = "1.2.13"
+version = "1.2.14"
 description = "Python @deprecated decorator to deprecate old python classes, functions or methods."
 category = "main"
 optional = false
@@ -124,7 +156,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 wrapt = ">=1.10,<2"
 
 [package.extras]
-dev = ["tox", "bump2version (<1)", "sphinx (<2)", "importlib-metadata (<3)", "importlib-resources (<4)", "configparser (<5)", "sphinxcontrib-websupport (<2)", "zipp (<2)", "PyTest (<5)", "PyTest-Cov (<2.6)", "pytest", "pytest-cov"]
+dev = ["tox", "pytest", "pytest-cov", "bump2version (<1)", "sphinx (<2)"]
 
 [[package]]
 name = "entrypoints"
@@ -457,7 +489,7 @@ testing = ["pytest", "pytest-benchmark"]
 
 [[package]]
 name = "protobuf"
-version = "4.23.1"
+version = "4.23.2"
 description = ""
 category = "main"
 optional = false
@@ -479,6 +511,14 @@ category = "dev"
 optional = false
 python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
 
+[[package]]
+name = "pycparser"
+version = "2.21"
+description = "C parser in Python"
+category = "main"
+optional = false
+python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*"
+
 [[package]]
 name = "pyflakes"
 version = "2.1.1"
@@ -653,7 +693,7 @@ python-versions = "*"
 
 [[package]]
 name = "typing-extensions"
-version = "4.6.1"
+version = "4.6.2"
 description = "Backported and Experimental Type Hints for Python 3.7+"
 category = "main"
 optional = false
@@ -702,7 +742,7 @@ otlp = ["opentelemetry-exporter-otlp-proto-grpc"]
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.7"
-content-hash = "05b6675e4dc718cf82618a9cbdf80e91daddfbb932139d9dc4491d443c2b8cd3"
+content-hash = "c3ecc35b65c4cff5d94fe624b0b528542b8084abb5794ef639c91d63d53503a8"
 
 [metadata.files]
 astroid = []
@@ -711,10 +751,12 @@ attrs = []
 backoff = []
 black = []
 certifi = []
+cffi = []
 charset-normalizer = []
 click = []
 colorama = []
 coverage = []
+cryptography = []
 deprecated = []
 entrypoints = []
 flake8 = []
@@ -747,6 +789,7 @@ pluggy = []
 protobuf = []
 py = []
 pycodestyle = []
+pycparser = []
 pyflakes = []
 pylint = []
 pylintfileheader = []
diff --git a/pyproject.toml b/pyproject.toml
index d6730229..167eb4be 100644
--- 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"