Skip to content

Commit

Permalink
Merge pull request #88 from aglavic/release
Browse files Browse the repository at this point in the history
Release a fix
  • Loading branch information
aglavic authored Jun 8, 2022
2 parents ef7886a + cdca6df commit da5a0fc
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 18 deletions.
5 changes: 5 additions & 0 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
History
=======

0.1.0 (2022-06-08)
------------------

* Fix missing data files in distribution

0.1.0 (2022-05-19)
------------------

Expand Down
2 changes: 1 addition & 1 deletion orsopy/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
"""Top-level package for orsopy."""

__version__ = "0.1.0"
__version__ = "0.1.1"
1 change: 0 additions & 1 deletion orsopy/orsopy.py

This file was deleted.

2 changes: 1 addition & 1 deletion orsopy/slddb/dbconfig.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
("name", cstr, None, "*"),
("description", cstr, None, None),
("formula", cformula, None, "*"),
("HR_fomula", cstr, None, None),
("HR_formula", cstr, None, None),
("density", cposfloat, None, "g/cm³ **"),
("FU_volume", cposfloat, None, "ų **"),
("SLD_n", ccomplex, None, "Å⁻² **"),
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ include_package_data = True

[options.package_data]
orsopy.slddb.element_table = nabs_geant4/*.npz
orsopy.fileio = schema/*.*
6 changes: 0 additions & 6 deletions tests/test_orsopy.py

This file was deleted.

20 changes: 11 additions & 9 deletions tools/example_pre-commit_windows
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
#!C:/Program\ Files/Git/bin/sh.exe
for file in $(git diff --cached --name-only | grep -E '\.(py)$')
do
echo "Reformat '$file'"
black -l 120 "$file"
isort -l 120 -l 120 --lbt 1 "$file"
git add "$file"

flake8 --max-line-length=120 --ignore=F401,W503,E203 "$file"
if [ $? -ne 0 ]; then
echo "flake8 failed on staged file '$file'"
exit 1 # exit with failure status
if [ -f "$file" ]; then
echo "Reformat '$file'"
black -l 120 "$file"
isort -l 120 -l 120 --lbt 1 "$file"
git add "$file"

flake8 --max-line-length=120 --ignore=F401,W503,E203 "$file"
if [ $? -ne 0 ]; then
echo "flake8 failed on staged file '$file'"
exit 1 # exit with failure status
fi
fi
done

0 comments on commit da5a0fc

Please sign in to comment.