diff --git a/.circleci/config.yml b/.circleci/config.yml index 60e7b0264..a53874990 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,35 +26,7 @@ jobs: pip install .[workflow-checks,graph-plotting,flask-plotting] pytest fireworks - pytest_pymongo4: - working_directory: ~/fireworks - docker: - - image: continuumio/miniconda3:4.6.14 - - image: circleci/mongo:latest - steps: - - checkout - - run: - command: | - export PATH=$HOME/miniconda3/bin:$PATH - conda config --set always_yes yes --set changeps1 no - conda update -q conda - conda info -a - conda create -q -n test-environment python=3.8 - source activate test-environment - conda update --quiet --all - pip install --quiet --ignore-installed -r requirements.txt -r requirements-ci.txt - - run: - name: Run fireworks tests - command: | - export PATH=$HOME/miniconda3/bin:$PATH - source activate test-environment - pip install --quiet -e . - pip install --quiet --upgrade pymongo - pytest fireworks - workflows: version: 2 build_and_test: - jobs: - - pytest - - pytest_pymongo4 + jobs: [pytest] diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 000000000..1326ed539 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,36 @@ +name: Test + +on: + push: + branches: [main] + pull_request: + branches: [main] + +jobs: + pytest: + runs-on: ubuntu-latest + + services: + mongodb: + image: mongo + ports: + - 27017:27017 + + steps: + - name: Checkout repo + uses: actions/checkout@v4 + + - name: Set up Python + uses: actions/setup-python@v5 + with: + python-version: 3.8 + + - name: Install dependencies + run: | + pip install -r requirements.txt -r requirements-ci.txt + + - name: Run fireworks tests + shell: bash -l {0} + run: | + pip install .[workflow-checks,graph-plotting,flask-plotting] + pytest fireworks diff --git a/requirements.txt b/requirements.txt index 4c45ea8da..66f62c17b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ ruamel.yaml==0.16.5 -pymongo==3.10.0 +pymongo==4.0.0 Jinja2 monty==3.0.2 python-dateutil==2.8.1 diff --git a/setup.py b/setup.py index 02e228c4d..cb1398be0 100644 --- a/setup.py +++ b/setup.py @@ -28,7 +28,7 @@ python_requires=">=3.8", install_requires=[ "ruamel.yaml>=0.15.35", - "pymongo>=3.3.0", + "pymongo>=4.0.0", "Jinja2>=2.8.0", "monty>=1.0.1", "python-dateutil>=2.5.3",