Clean branch

Set version to 0.9.4 Remove mentions of test_release branch
Materials-Consortia · Jun 26, 2020 · 2bbb42a · 2bbb42a
1 parent bfb3169
commit 2bbb42a
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 114 deletions.
diff --git a/.github/workflows/check_released_tag.py b/.github/workflows/check_released_tag.py
diff --git a/.github/workflows/deps_lint.yml b/.github/workflows/deps_lint.yml
@@ -5,7 +5,6 @@ on:
   push:
     branches:
     - master
-    - test_release
     - 'push-action/**'
 
 jobs:

diff --git a/.github/workflows/publish-on-pypi.yml b/.github/workflows/publish-on-pypi.yml
@@ -1,18 +1,17 @@
 name: Publish on PyPI
 
-on: [push]
-  # release:
-  #   types:
-  #   - published
+on:
+  release:
+    types:
+    - published
 
 jobs:
 
   publish:
     runs-on: ubuntu-latest
-    if: github.repository == 'Materials-Consortia/optimade-python-tools' && startsWith(github.ref, 'refs/tags/test_')
-    # if: github.repository == 'Materials-Consortia/optimade-python-tools' && startsWith(github.ref, 'refs/tags/v')
+    if: github.repository == 'Materials-Consortia/optimade-python-tools' && startsWith(github.ref, 'refs/tags/v')
     env:
-      PUBLISH_UPDATE_BRANCH: test_release
+      PUBLISH_UPDATE_BRANCH: master
 
     steps:
     - name: Checkout repository
@@ -29,9 +28,9 @@ jobs:
       run: |
         python -m pip install -U pip
         pip install -U setuptools
-        pip install -U -e .[all]
+        pip install -U -e .[dev]
 
-    - name: Update version, generate changelog, and update 'master'
+    - name: Update version, generate changelog, and update '${{ env.PUBLISH_UPDATE_BRANCH }}'
       uses: CasperWA/push-protected@master
       with:
         token: ${{ secrets.RELEASE_PAT_CASPER }}
@@ -42,11 +41,11 @@ jobs:
     - name: Build source distribution
       run: python ./setup.py sdist
 
-    # - name: Publish package to PyPI
-    #   uses: pypa/gh-action-pypi-publish@master
-    #   with:
-    #     user: __token__
-    #     password: ${{ secrets.PYPI_PASSWORD }}
+    - name: Publish package to PyPI
+      uses: pypa/gh-action-pypi-publish@master
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_PASSWORD }}
 
     - name: Update tag to latest commit
       run: |
@@ -64,9 +63,9 @@ jobs:
     - name: Build docs
       run: mkdocs build
 
-    # - name: Deploy
-    #   uses: peaceiris/actions-gh-pages@v3
-    #   with:
-    #     github_token: ${{ secrets.GITHUB_TOKEN }}
-    #     publish_branch: gh-pages
-    #     publish_dir: ./site
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_branch: gh-pages
+        publish_dir: ./site
diff --git a/.github/workflows/update_changelog.sh b/.github/workflows/update_changelog.sh
@@ -13,9 +13,7 @@ pip install -U -e .[server]
 pip install invoke jsondiff
 
 echo "-o- Update version -o-"
-# invoke setver -v ${GITHUB_REF#refs/tags/}
-echo "Will actually be the tag name: ${GITHUB_REF#refs/tags/}, but is now 0.10.5"
-invoke setver -v "v0.10.5"
+invoke setver -v ${GITHUB_REF#refs/tags/}
 
 echo "\n-o- Generate changelog -o-"
 apt-get update
@@ -32,4 +30,4 @@ echo "\n-o- Commit updates -o-"
 git add optimade/__init__.py
 git add openapi/index_openapi.json openapi/openapi.json
 git add docs/CHANGELOG.md
-git commit -m "Release ${GITHUB_REF#refs/tags/} (test, using 0.10.5)"
+git commit -m "Release ${GITHUB_REF#refs/tags/}"
diff --git a/openapi/index_openapi.json b/openapi/index_openapi.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.2",
   "info": {
     "title": "OPTIMADE API - Index meta-database",
-    "description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\nThis is the \"special\" index meta-database.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v0.9.1) v0.9.1.",
+    "description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\nThis is the \"special\" index meta-database.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v0.9.4) v0.9.4.",
     "version": "1.0.0-rc.2"
   },
   "paths": {

diff --git a/openapi/openapi.json b/openapi/openapi.json
@@ -2,7 +2,7 @@
   "openapi": "3.0.2",
   "info": {
     "title": "OPTIMADE API",
-    "description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v0.9.1) v0.9.1.",
+    "description": "The [Open Databases Integration for Materials Design (OPTIMADE) consortium](https://www.optimade.org/) aims to make materials databases interoperational by developing a common REST API.\n\nThis specification is generated using [`optimade-python-tools`](https://github.com/Materials-Consortia/optimade-python-tools/tree/v0.9.4) v0.9.4.",
     "version": "1.0.0-rc.2"
   },
   "paths": {

diff --git a/optimade/__init__.py b/optimade/__init__.py
@@ -1,2 +1,2 @@
-__version__ = "0.9.2"
+__version__ = "0.9.4"
 __api_version__ = "1.0.0-rc.2"
diff --git a/setup.py b/setup.py
@@ -25,7 +25,7 @@
 # Client minded
 aiida_deps = ["aiida-core~=1.2"]
 ase_deps = ["ase~=3.19"]
-cif_deps = ["numpy~=1.18"]
+cif_deps = ["numpy~=1.19"]
 pdb_deps = cif_deps
 pymatgen_deps = ["pymatgen~=2020.6"]
 jarvis_deps = ["jarvis-tools~=2020.6"]
@@ -35,15 +35,15 @@
 docs_deps = [
     "mkdocs~=1.1",
     "mkdocs-awesome-pages-plugin~=2.2",
-    "mkdocs-material~=5.2",
+    "mkdocs-material~=5.3",
     "mkdocs-material-components~=1.10",
     "mkdocs-material-extensions~=1.0",
     "mkdocs-minify-plugin~=0.3.0",
-    "mkdocstrings~=0.11.4",
+    "mkdocstrings~=0.12.0",
 ]
 testing_deps = [
     "pytest~=5.4",
-    "pytest-cov~=2.9",
+    "pytest-cov~=2.10",
     "codecov~=2.1",
     "openapi-spec-validator~=0.2.8",
     "jsondiff~=1.2",
@@ -90,11 +90,11 @@
     ],
     python_requires=">=3.6",
     install_requires=[
-        "lark-parser~=0.8.6",
+        "lark-parser~=0.8.9",
         "fastapi~=0.58.0",
         "pydantic~=1.5",
         "email_validator~=1.1",
-        "requests~=2.23",
+        "requests~=2.24",
         'typing-extensions~=3.7;python_version<"3.8"',
     ],
     extras_require={