Skip to content

Commit

Permalink
Merge pull request giovannipizzi#89 from giovannipizzi/release_2.0.0a2
Browse files Browse the repository at this point in the history
Release 2.0.0 ok seekpath
  • Loading branch information
giovannipizzi authored May 17, 2020
2 parents 5aa3d04 + 5b777f8 commit 886959b
Show file tree
Hide file tree
Showing 1,381 changed files with 1,734 additions and 541,776 deletions.
21 changes: 0 additions & 21 deletions .docker_files/apache_run.sh

This file was deleted.

22 changes: 0 additions & 22 deletions .docker_files/create_secret_key.sh

This file was deleted.

13 changes: 0 additions & 13 deletions .docker_files/seekpath-apache.conf

This file was deleted.

8 changes: 0 additions & 8 deletions .dockerignore

This file was deleted.

9 changes: 0 additions & 9 deletions .gitattributes

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Continuous integration

on: [push, pull_request]

jobs:
precommit:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6

- name: Install python dependencies
run: |
pip install -r optional-requirements.txt
pip install -e .[dev,bz]
pip freeze
- name: Run pre-commit
run:
pre-commit run --all-files || ( git status --short ; git diff ; exit 1 )

tests:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1

- name: Set up Python 3.6
uses: actions/setup-python@v1
with:
python-version: 3.6

- name: Install python dependencies
run: |
pip install -e .[dev,bz]
pip freeze
- name: Run the tests
run: pytest
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ seekpath.egg-info/
.DS_Store
.coverage
.idea/
.vscode/
.vscode/
1 change: 0 additions & 1 deletion .htaccess

This file was deleted.

38 changes: 12 additions & 26 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,32 +1,18 @@
# yet another python formatter
- repo: git://github.com/pre-commit/mirrors-yapf
rev: v0.29.0
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.2.3
hooks:
- id: yapf
language: system
files: >-
(?x)^(
seekpath/.*.py|
webservice/.*.py|
docs/source/conf.py|
run_tests.py|
setup.py
)$
- id: trailing-whitespace

# prospector: collection of linters
#- repo: git://github.com/guykisel/prospector-mirror
# rev: b27f281eb9398fc8504415d7fbdabf119ea8c5e1
- repo: https://github.com/ambv/black
rev: 19.10b0
hooks:
- id: black

#- repo: local
# hooks:
# - id: prospector
# language: system
# types: [file, python]
# files: >-
# (?x)^(
# seekpath/.*.py|
# webservice/.*.py|
# docs/source/conf.py|
# run_tests.py|
# setup.py
# )$


# name: prospector
# description: "This hook runs Prospector: https://github.com/landscapeio/prospector"
# entry: prospector
2 changes: 2 additions & 0 deletions .prospector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
mccabe:
run: false
19 changes: 19 additions & 0 deletions .pylintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[MASTER]
disable=import-outside-toplevel,bad-continuation,locally-disabled,invalid-name,too-many-locals,too-many-statements,too-many-return-statements,too-many-branches

[DESIGN]

# Maximum number of arguments for function / method
max-args=10

# Maximum number of attributes for a class (see R0902).
max-attributes=12

# Maximum number of branch for function / method body
max-branches=12

# Maximum number of locals for function / method body
max-locals=30

# Maximum number of characters on a single line.
max-line-length=120
56 changes: 0 additions & 56 deletions .travis.yml

This file was deleted.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# v2.0.0
- Dropped python 2 support
- Moved out the web tool to [tools-seekpath](https://github.com/materialscloud-org/tools-seekpath), based on [tools-barebone](https://github.com/materialscloud-org/tools-barebone), whose codebases mostly take inspiration from the web tool implemented in seekpath v1.x

# v1.x
First versions of seekpath, supportinb both python 2 an python 3, and providing a web tool to interactively inspect the results of seekpath (hosted on the [Materials Cloud tools section](http://www.materialscloud.org/tools/seekpath/)).
113 changes: 0 additions & 113 deletions Dockerfile

This file was deleted.

6 changes: 3 additions & 3 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c), 2016-2018, Giovanni Pizzi, ECOLE POLYTECHNIQUE FEDERALE DE
LAUSANNE (Theory and Simulation of Materials (THEOS) and National Centre for
Copyright (c), 2016-2018, Giovanni Pizzi, ECOLE POLYTECHNIQUE FEDERALE DE
LAUSANNE (Theory and Simulation of Materials (THEOS) and National Centre for
Computational Design and Discovery of Novel Materials (NCCR MARVEL)),
Switzerland. All rights reserved.

Expand All @@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

---
---

For a list of open-source software included in this repository, see the file
open_source_linceses.txt.
Loading

0 comments on commit 886959b

Please sign in to comment.