From 6584917b11e4420f358778e76ca2a98293dae2d2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 10:00:22 -0800 Subject: [PATCH 1/8] Enforce `responses==0.18.0` --- requirements-testing.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-testing.txt b/requirements-testing.txt index 2b1177bdd..527df8f45 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -9,3 +9,4 @@ pydocstyle==6.1.1 flake8==4.0.1 mypy==0.812 mypy-extensions==0.4.3 +responses==0.18.0 \ No newline at end of file From 694b712ce6df186c4c9294262c94cafe7f234cbf Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 10:17:16 -0800 Subject: [PATCH 2/8] Fix testing reqs --- requirements-testing.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-testing.txt b/requirements-testing.txt index 527df8f45..88c595f7a 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -9,4 +9,4 @@ pydocstyle==6.1.1 flake8==4.0.1 mypy==0.812 mypy-extensions==0.4.3 -responses==0.18.0 \ No newline at end of file +responses<=0.18.0 \ No newline at end of file From c7e8b6a13e9e6707e54194a3e999ec1893f27153 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 10:32:05 -0800 Subject: [PATCH 3/8] Add python3.9 to tests --- .github/workflows/testing.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2403f9eed..6ecac6173 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -58,7 +58,7 @@ jobs: max-parallel: 6 matrix: os: [ubuntu-latest] - python-version: [3.6, 3.7, 3.8] + python-version: [3.6, 3.7, 3.8, 3.9] runs-on: ${{ matrix.os }} From 767e839889dc94ab06d4a17114f80ed7bd73a9c0 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 10:39:10 -0800 Subject: [PATCH 4/8] Update python version for linting --- .github/workflows/testing.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 6ecac6173..ca6352b0b 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -18,10 +18,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.7 + - name: Set up Python 3.8 uses: actions/setup-python@v3 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | From 1b03e59792a58e7c4358c394d478ad99a5ddd054 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 11:00:39 -0800 Subject: [PATCH 5/8] Remove py3.6 support --- .github/workflows/testing.yml | 8 ++++---- requirements-optional.txt | 2 +- requirements-testing.txt | 4 ++-- requirements.txt | 3 +-- setup.py | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index ca6352b0b..2b0b59d43 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -16,7 +16,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python 3.8 uses: actions/setup-python@v3 @@ -58,12 +58,12 @@ jobs: max-parallel: 6 matrix: os: [ubuntu-latest] - python-version: [3.6, 3.7, 3.8, 3.9] + python-version: [3.7, 3.8, 3.9] runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v3 @@ -93,7 +93,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-python@v3 with: diff --git a/requirements-optional.txt b/requirements-optional.txt index c788d33c9..d9fb3157c 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -1,4 +1,4 @@ -uvicorn==0.13.4 +uvicorn==0.17.5 hvac==0.11.2 IPython==7.16.1;python_version<"3.7" IPython==7.31.1;python_version>"3.6" diff --git a/requirements-testing.txt b/requirements-testing.txt index 88c595f7a..60747cf57 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -1,12 +1,12 @@ pre-commit==2.17.0 pytest==7.0.0 -pytest-asyncio==0.15.1 +pytest-asyncio==0.18.2 pytest-cov==3.0.0 pytest-mock==3.5.1 pytest-xdist==2.5.0 moto==3.0.2 pydocstyle==6.1.1 flake8==4.0.1 -mypy==0.812 +mypy==0.931 mypy-extensions==0.4.3 responses<=0.18.0 \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 3b6d384ac..952d5bcc2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,6 @@ mongogrant==0.3.3 aioitertools==0.9.0 pydantic==1.9.0 fastapi==0.73.0 -numpy==1.19.5;python_version<"3.7" numpy==1.21.0;python_version>"3.6" pyzmq==22.3.0 dnspython==2.1.0 @@ -16,5 +15,5 @@ uvicorn==0.13.4 sshtunnel==0.4.0 msgpack==1.0.3 msgpack-python==0.5.6 -orjson==3.6.0 +orjson==3.6.7 boto3==1.20.46 diff --git a/setup.py b/setup.py index 2d1db39a4..61f068bbb 100644 --- a/setup.py +++ b/setup.py @@ -43,7 +43,7 @@ "sshtunnel>=0.1.5", "msgpack>=0.5.6", "orjson>=3.6.0", - "boto3>=1.20.41" + "boto3>=1.20.41", ], extras_require={ "vault": ["hvac>=0.9.5"], @@ -64,5 +64,5 @@ ], entry_points={"console_scripts": ["mrun = maggma.cli:run"]}, tests_require=["pytest"], - python_requires=">=3.6", + python_requires=">=3.7", ) From 3892bcb8da48189c1ed0d13e851e8b4beed3d1bb Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 11:02:24 -0800 Subject: [PATCH 6/8] Update test wflow --- .github/workflows/testing.yml | 1 + requirements-optional.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 2b0b59d43..b3af58d70 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -48,6 +48,7 @@ jobs: flake8 --count --exit-zero --max-complexity=20 --statistics src/maggma test: + needs: lint services: local_mongodb: image: mongo:4.0 diff --git a/requirements-optional.txt b/requirements-optional.txt index d9fb3157c..a01f91401 100644 --- a/requirements-optional.txt +++ b/requirements-optional.txt @@ -1,6 +1,5 @@ uvicorn==0.17.5 hvac==0.11.2 -IPython==7.16.1;python_version<"3.7" IPython==7.31.1;python_version>"3.6" nbformat==5.1.3 regex==2022.1.18 From afa58a98e832c77af877b5d075f5c94d6f8c7617 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 11:04:40 -0800 Subject: [PATCH 7/8] Add pyaml types --- requirements-testing.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-testing.txt b/requirements-testing.txt index 60747cf57..733a86f34 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -9,4 +9,5 @@ pydocstyle==6.1.1 flake8==4.0.1 mypy==0.931 mypy-extensions==0.4.3 -responses<=0.18.0 \ No newline at end of file +responses<=0.18.0 +types-PyYAML==6.0.4 \ No newline at end of file From 23f365c184b1ec56d047058140903ced7c52e7a5 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 7 Mar 2022 11:05:22 -0800 Subject: [PATCH 8/8] Add setuptools types --- requirements-testing.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-testing.txt b/requirements-testing.txt index 733a86f34..4d57f18f4 100644 --- a/requirements-testing.txt +++ b/requirements-testing.txt @@ -10,4 +10,5 @@ flake8==4.0.1 mypy==0.931 mypy-extensions==0.4.3 responses<=0.18.0 -types-PyYAML==6.0.4 \ No newline at end of file +types-PyYAML==6.0.4 +types-setuptools==57.4.9 \ No newline at end of file