6 Commits
0.1.2 ... 0.1.3

7 changed files with 12 additions and 10 deletions

View File

@ -1,8 +1,6 @@
language: python
python:
- 3.6
- 3.7
- 3.8
# Build only tagged commits
if: tag IS present

2
.vscode/launch.json vendored
View File

@ -5,7 +5,7 @@
"name": "pyzebra",
"type": "python",
"request": "launch",
"program": "${workspaceFolder}/pyzebra/cli.py",
"program": "${workspaceFolder}/pyzebra/app/cli.py",
"console": "internalConsole",
"env": {},
},

2
conda-recipe/bld.bat Normal file
View File

@ -0,0 +1,2 @@
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
if errorlevel 1 exit 1

View File

@ -8,20 +8,23 @@ source:
path: ..
build:
noarch: python
number: 0
entry_points:
- pyzebra = pyzebra.cli:main
- pyzebra = pyzebra.app.cli:main
requirements:
build:
- python
- python >=3.6
- setuptools
run:
- python
- python >=3.6
- numpy
- scipy
- pandas
- h5py
- bokeh
- matplotlib
- numba
- lmfit
- uncertainties

3
make_release.py Normal file → Executable file
View File

@ -10,7 +10,6 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument("level", type=str, choices=["patch", "minor", "major"])
parser.add_argument("tag_msg", type=str, help="tag message")
args = parser.parse_args()
with open(filepath) as f:
@ -35,7 +34,7 @@ def main():
f.write(re.sub(r'__version__ = "(.*?)"', f'__version__ = "{new_version}"', file_content))
os.system(f"git commit {filepath} -m 'Updating for version {new_version}'")
os.system(f"git tag -a {new_version} -m '{args.tag_msg}'")
os.system(f"git tag -a {new_version} -m 'Release {new_version}'")
if __name__ == "__main__":

View File

@ -6,4 +6,4 @@ from pyzebra.ccl_io import load_1D, parse_1D, export_comm
from pyzebra.param_study_moduls import add_dict, auto, merge, scan_dict
from pyzebra.xtal import *
__version__ = "0.1.2"
__version__ = "0.1.3"

View File

@ -18,7 +18,7 @@ def main():
This is a wrapper around a bokeh server that provides an interface to launch the application,
bundled with the pyzebra package.
"""
app_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "app", "app.py")
app_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), "app.py")
parser = argparse.ArgumentParser(
prog="pyzebra", formatter_class=argparse.ArgumentDefaultsHelpFormatter