Skip to content

Commit

Permalink
Merge pull request #579 from materialsproject/bugfix/fix_moto_tests
Browse files Browse the repository at this point in the history
Remove python3.6 support and fix tests
  • Loading branch information
munrojm committed Mar 7, 2022
2 parents 65852ab + 23f365c commit 7ba89b1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 14 deletions.
13 changes: 7 additions & 6 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- 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: |
Expand All @@ -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
Expand All @@ -58,12 +59,12 @@ jobs:
max-parallel: 6
matrix:
os: [ubuntu-latest]
python-version: [3.6, 3.7, 3.8]
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
Expand Down Expand Up @@ -93,7 +94,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- uses: actions/setup-python@v3
with:
Expand Down
3 changes: 1 addition & 2 deletions requirements-optional.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
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"
nbformat==5.1.3
regex==2022.1.18
Expand Down
7 changes: 5 additions & 2 deletions requirements-testing.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
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
types-PyYAML==6.0.4
types-setuptools==57.4.9
3 changes: 1 addition & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,12 @@ 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
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
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -64,5 +64,5 @@
],
entry_points={"console_scripts": ["mrun = maggma.cli:run"]},
tests_require=["pytest"],
python_requires=">=3.6",
python_requires=">=3.7",
)

0 comments on commit 7ba89b1

Please sign in to comment.