Skip to content

Commit

Permalink
Merge branch 'master' into add_db_page_limit
Browse files Browse the repository at this point in the history
  • Loading branch information
CasperWA committed Jan 17, 2020
2 parents 47f15e7 + 69d215c commit a1481ea
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 17 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/deps_lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ jobs:
fail-fast: false
max-parallel: 2
matrix:
python-version: [3.7, 3.8]
python-version: [3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
fail-fast: false
max-parallel: 2
matrix:
python-version: [3.7, 3.8]
python-version: [3.6, 3.7, 3.8]

steps:
- uses: actions/checkout@v1
Expand Down Expand Up @@ -158,7 +158,7 @@ jobs:
# fail-fast: false
# max-parallel: 2
# matrix:
# python-version: [3.7, 3.8]
# python-version: [3.6, 3.7, 3.8]

# steps:
# - uses: actions/checkout@v1
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
lark-parser==0.7.8
fastapi==0.44.0
pydantic==1.2
fastapi==0.46.0
pydantic==1.3
email_validator==1.0.5
requests==2.22.0
uvicorn==0.10
pymongo==3.8
mongomock==3.16
django==2.2.8
uvicorn==0.11.1
pymongo==3.10.1
mongomock==3.18.0
django==2.2.9
elasticsearch_dsl==6.4.0
2 changes: 1 addition & 1 deletion optimade/__init__.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
__version__ = "0.3.0"
__version__ = "0.3.1"
__api_version__ = "0.10.1"
16 changes: 9 additions & 7 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
module_dir = Path(__file__).resolve().parent

# Dependencies
mongo_deps = ["pymongo~=3.8", "mongomock~=3.16"]
mongo_deps = ["pymongo~=3.10", "mongomock~=3.18"]
server_deps = ["uvicorn"] + mongo_deps
django_deps = ["django~=2.2,>=2.2.8"]
django_deps = ["django~=2.2,>=2.2.9"]
elastic_deps = ["elasticsearch_dsl~=6.4"]
testing_deps = [
"pytest~=3.6",
"pytest~=3.10",
"pytest-cov",
"codecov",
"openapi-spec-validator",
Expand All @@ -20,7 +20,7 @@

setup(
name="optimade",
version="0.3.0",
version="0.3.1",
url="https://github.com/Materials-Consortia/optimade-python-tools",
license="MIT",
author="OPTiMaDe Development Team",
Expand All @@ -34,17 +34,19 @@
classifiers=[
"Development Status :: 3 - Alpha",
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Intended Audience :: Developers",
"Topic :: Database",
"Topic :: Database :: Database Engines/Servers",
"Topic :: Database :: Front-Ends",
],
python_requires=">=3.7",
python_requires=">=3.6",
install_requires=[
"lark-parser~=0.7.8",
"fastapi~=0.44",
"pydantic~=1.2",
"fastapi~=0.46",
"pydantic~=1.3",
"email_validator",
"requests",
],
Expand Down

0 comments on commit a1481ea

Please sign in to comment.