Fix req merge

materialsproject · Sep 6, 2023 · 0c2025a · 0c2025a
1 parent 286c31b
commit 0c2025a
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 219 deletions.
diff --git a/requirements/macos-latest_py3.10_extras.txt b/requirements/macos-latest_py3.10_extras.txt
@@ -6,15 +6,9 @@
 #
 aioitertools==0.11.0
     # via maggma (setup.py)
-<<<<<<< HEAD
-anyio==4.0.0
-    # via
-    #   httpcore
-=======
 anyio==3.7.1
     # via
     #   fastapi
->>>>>>> origin/main
     #   starlette
 appnope==0.1.3
     # via ipython
@@ -42,17 +36,9 @@ beautifulsoup4==4.12.2
     # via readtime
 blinker==1.6.2
     # via flask
-<<<<<<< HEAD
-boto3==1.28.39
-    # via
-    #   maggma (setup.py)
-    #   moto
-botocore==1.31.39
-=======
 boto3==1.28.40
     # via maggma (setup.py)
 botocore==1.31.40
->>>>>>> origin/main
     # via
     #   boto3
     #   moto
@@ -106,12 +92,6 @@ exceptiongroup==1.1.3
     # via
     #   anyio
     #   ipython
-<<<<<<< HEAD
-    #   pytest
-execnet==2.0.2
-    # via pytest-xdist
-=======
->>>>>>> origin/main
 executing==1.2.0
     # via stack-data
 fastapi==0.103.1
@@ -145,11 +125,6 @@ idna==3.4
     #   anyio
     #   httpx
     #   requests
-<<<<<<< HEAD
-iniconfig==2.0.0
-    # via pytest
-=======
->>>>>>> origin/main
 ipython==8.15.0
     # via maggma (setup.py)
 isodate==0.6.1
@@ -303,14 +278,7 @@ pydantic==1.10.12
 pydash==7.0.6
     # via maggma (setup.py)
 pygments==2.16.1
-<<<<<<< HEAD
-    # via
-    #   ipython
-    #   mkdocs-material
-    #   rich
-=======
     # via ipython
->>>>>>> origin/main
 pyhcl==0.4.5
     # via hvac
 pyjwt[crypto]==2.8.0

diff --git a/requirements/macos-latest_py3.11_extras.txt b/requirements/macos-latest_py3.11_extras.txt
@@ -6,15 +6,9 @@
 #
 aioitertools==0.11.0
     # via maggma (setup.py)
-<<<<<<< HEAD
-anyio==4.0.0
-    # via
-    #   httpcore
-=======
 anyio==3.7.1
     # via
     #   fastapi
->>>>>>> origin/main
     #   starlette
 appnope==0.1.3
     # via ipython
@@ -42,17 +36,9 @@ beautifulsoup4==4.12.2
     # via readtime
 blinker==1.6.2
     # via flask
-<<<<<<< HEAD
-boto3==1.28.39
-    # via
-    #   maggma (setup.py)
-    #   moto
-botocore==1.31.39
-=======
 boto3==1.28.40
     # via maggma (setup.py)
 botocore==1.31.40
->>>>>>> origin/main
     # via
     #   boto3
     #   moto
@@ -137,11 +123,6 @@ idna==3.4
     #   anyio
     #   httpx
     #   requests
-<<<<<<< HEAD
-iniconfig==2.0.0
-    # via pytest
-=======
->>>>>>> origin/main
 ipython==8.15.0
     # via maggma (setup.py)
 isodate==0.6.1
@@ -295,14 +276,7 @@ pydantic==1.10.12
 pydash==7.0.6
     # via maggma (setup.py)
 pygments==2.16.1
-<<<<<<< HEAD
-    # via
-    #   ipython
-    #   mkdocs-material
-    #   rich
-=======
     # via ipython
->>>>>>> origin/main
 pyhcl==0.4.5
     # via hvac
 pyjwt[crypto]==2.8.0

diff --git a/requirements/macos-latest_py3.9_extras.txt b/requirements/macos-latest_py3.9_extras.txt
@@ -6,15 +6,9 @@
 #
 aioitertools==0.11.0
     # via maggma (setup.py)
-<<<<<<< HEAD
-anyio==4.0.0
-    # via
-    #   httpcore
-=======
 anyio==3.7.1
     # via
     #   fastapi
->>>>>>> origin/main
     #   starlette
 appnope==0.1.3
     # via ipython
@@ -42,17 +36,9 @@ beautifulsoup4==4.12.2
     # via readtime
 blinker==1.6.2
     # via flask
-<<<<<<< HEAD
-boto3==1.28.39
-    # via
-    #   maggma (setup.py)
-    #   moto
-botocore==1.31.39
-=======
 boto3==1.28.40
     # via maggma (setup.py)
 botocore==1.31.40
->>>>>>> origin/main
     # via
     #   boto3
     #   moto
@@ -106,12 +92,6 @@ exceptiongroup==1.1.3
     # via
     #   anyio
     #   ipython
-<<<<<<< HEAD
-    #   pytest
-execnet==2.0.2
-    # via pytest-xdist
-=======
->>>>>>> origin/main
 executing==1.2.0
     # via stack-data
 fastapi==0.103.1
@@ -146,17 +126,7 @@ idna==3.4
     #   httpx
     #   requests
 importlib-metadata==6.8.0
-<<<<<<< HEAD
-    # via
-    #   flask
-    #   markdown
-    #   mkdocs
-    #   mkdocstrings
-iniconfig==2.0.0
-    # via pytest
-=======
     # via flask
->>>>>>> origin/main
 ipython==8.15.0
     # via maggma (setup.py)
 isodate==0.6.1
@@ -310,14 +280,7 @@ pydantic==1.10.12
 pydash==7.0.6
     # via maggma (setup.py)
 pygments==2.16.1
-<<<<<<< HEAD
-    # via
-    #   ipython
-    #   mkdocs-material
-    #   rich
-=======
     # via ipython
->>>>>>> origin/main
 pyhcl==0.4.5
     # via hvac
 pyjwt[crypto]==2.8.0

diff --git a/requirements/ubuntu-latest_py3.10_extras.txt b/requirements/ubuntu-latest_py3.10_extras.txt
@@ -6,19 +6,11 @@
 #
 aioitertools==0.11.0
     # via maggma (setup.py)
-<<<<<<< HEAD
-anyio==4.0.0
-    # via
-    #   httpcore
-    #   starlette
-asttokens==2.2.1
-=======
 anyio==3.7.1
     # via
     #   fastapi
     #   starlette
 asttokens==2.3.0
->>>>>>> origin/main
     # via stack-data
 attrs==23.1.0
     # via
@@ -42,17 +34,9 @@ beautifulsoup4==4.12.2
     # via readtime
 blinker==1.6.2
     # via flask
-<<<<<<< HEAD
-boto3==1.28.39
-    # via
-    #   maggma (setup.py)
-    #   moto
-botocore==1.31.39
-=======
 boto3==1.28.40
     # via maggma (setup.py)
 botocore==1.31.40
->>>>>>> origin/main
     # via
     #   boto3
     #   moto
@@ -106,12 +90,6 @@ exceptiongroup==1.1.3
     # via
     #   anyio
     #   ipython
-<<<<<<< HEAD
-    #   pytest
-execnet==2.0.2
-    # via pytest-xdist
-=======
->>>>>>> origin/main
 executing==1.2.0
     # via stack-data
 fastapi==0.103.1
@@ -145,11 +123,6 @@ idna==3.4
     #   anyio
     #   httpx
     #   requests
-<<<<<<< HEAD
-iniconfig==2.0.0
-    # via pytest
-=======
->>>>>>> origin/main
 ipython==8.15.0
     # via maggma (setup.py)
 isodate==0.6.1
@@ -303,14 +276,7 @@ pydantic==1.10.12
 pydash==7.0.6
     # via maggma (setup.py)
 pygments==2.16.1
-<<<<<<< HEAD
-    # via
-    #   ipython
-    #   mkdocs-material
-    #   rich
-=======
     # via ipython
->>>>>>> origin/main
 pyhcl==0.4.5
     # via hvac
 pyjwt[crypto]==2.8.0

diff --git a/requirements/ubuntu-latest_py3.11_extras.txt b/requirements/ubuntu-latest_py3.11_extras.txt
@@ -6,19 +6,11 @@
 #
 aioitertools==0.11.0
     # via maggma (setup.py)
-<<<<<<< HEAD
-anyio==4.0.0
-    # via
-    #   httpcore
-    #   starlette
-asttokens==2.2.1
-=======
 anyio==3.7.1
     # via
     #   fastapi
     #   starlette
 asttokens==2.3.0
->>>>>>> origin/main
     # via stack-data
 attrs==23.1.0
     # via
@@ -42,17 +34,9 @@ beautifulsoup4==4.12.2
     # via readtime
 blinker==1.6.2
     # via flask
-<<<<<<< HEAD
-boto3==1.28.39
-    # via
-    #   maggma (setup.py)
-    #   moto
-botocore==1.31.39
-=======
 boto3==1.28.40
     # via maggma (setup.py)
 botocore==1.31.40
->>>>>>> origin/main
     # via
     #   boto3
     #   moto
@@ -137,11 +121,6 @@ idna==3.4
     #   anyio
     #   httpx
     #   requests
-<<<<<<< HEAD
-iniconfig==2.0.0
-    # via pytest
-=======
->>>>>>> origin/main
 ipython==8.15.0
     # via maggma (setup.py)
 isodate==0.6.1
@@ -295,14 +274,7 @@ pydantic==1.10.12
 pydash==7.0.6
     # via maggma (setup.py)
 pygments==2.16.1
-<<<<<<< HEAD
-    # via
-    #   ipython
-    #   mkdocs-material
-    #   rich
-=======
     # via ipython
->>>>>>> origin/main
 pyhcl==0.4.5
     # via hvac
 pyjwt[crypto]==2.8.0