Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
b31f359ee7 | |||
63150a4b19 | |||
8d779b11f6 | |||
b2d603b3c5 | |||
2ddb0a668a | |||
de81f2fd9f |
@ -1,8 +1,6 @@
|
|||||||
language: python
|
language: python
|
||||||
python:
|
python:
|
||||||
- 3.6
|
- 3.6
|
||||||
- 3.7
|
|
||||||
- 3.8
|
|
||||||
|
|
||||||
# Build only tagged commits
|
# Build only tagged commits
|
||||||
if: tag IS present
|
if: tag IS present
|
||||||
|
2
.vscode/launch.json
vendored
2
.vscode/launch.json
vendored
@ -5,7 +5,7 @@
|
|||||||
"name": "pyzebra",
|
"name": "pyzebra",
|
||||||
"type": "python",
|
"type": "python",
|
||||||
"request": "launch",
|
"request": "launch",
|
||||||
"program": "${workspaceFolder}/pyzebra/cli.py",
|
"program": "${workspaceFolder}/pyzebra/app/cli.py",
|
||||||
"console": "internalConsole",
|
"console": "internalConsole",
|
||||||
"env": {},
|
"env": {},
|
||||||
},
|
},
|
||||||
|
2
conda-recipe/bld.bat
Normal file
2
conda-recipe/bld.bat
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
"%PYTHON%" setup.py install --single-version-externally-managed --record=record.txt
|
||||||
|
if errorlevel 1 exit 1
|
@ -8,20 +8,23 @@ source:
|
|||||||
path: ..
|
path: ..
|
||||||
|
|
||||||
build:
|
build:
|
||||||
|
noarch: python
|
||||||
number: 0
|
number: 0
|
||||||
entry_points:
|
entry_points:
|
||||||
- pyzebra = pyzebra.cli:main
|
- pyzebra = pyzebra.app.cli:main
|
||||||
|
|
||||||
requirements:
|
requirements:
|
||||||
build:
|
build:
|
||||||
- python
|
- python >=3.6
|
||||||
- setuptools
|
- setuptools
|
||||||
run:
|
run:
|
||||||
- python
|
- python >=3.6
|
||||||
- numpy
|
- numpy
|
||||||
- scipy
|
- scipy
|
||||||
|
- pandas
|
||||||
- h5py
|
- h5py
|
||||||
- bokeh
|
- bokeh
|
||||||
|
- matplotlib
|
||||||
- numba
|
- numba
|
||||||
- lmfit
|
- lmfit
|
||||||
- uncertainties
|
- uncertainties
|
||||||
|
3
make_release.py
Normal file → Executable file
3
make_release.py
Normal file → Executable file
@ -10,7 +10,6 @@ def main():
|
|||||||
|
|
||||||
parser = argparse.ArgumentParser()
|
parser = argparse.ArgumentParser()
|
||||||
parser.add_argument("level", type=str, choices=["patch", "minor", "major"])
|
parser.add_argument("level", type=str, choices=["patch", "minor", "major"])
|
||||||
parser.add_argument("tag_msg", type=str, help="tag message")
|
|
||||||
args = parser.parse_args()
|
args = parser.parse_args()
|
||||||
|
|
||||||
with open(filepath) as f:
|
with open(filepath) as f:
|
||||||
@ -35,7 +34,7 @@ def main():
|
|||||||
f.write(re.sub(r'__version__ = "(.*?)"', f'__version__ = "{new_version}"', file_content))
|
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 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__":
|
if __name__ == "__main__":
|
||||||
|
@ -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.param_study_moduls import add_dict, auto, merge, scan_dict
|
||||||
from pyzebra.xtal import *
|
from pyzebra.xtal import *
|
||||||
|
|
||||||
__version__ = "0.1.2"
|
__version__ = "0.1.3"
|
||||||
|
@ -18,7 +18,7 @@ def main():
|
|||||||
This is a wrapper around a bokeh server that provides an interface to launch the application,
|
This is a wrapper around a bokeh server that provides an interface to launch the application,
|
||||||
bundled with the pyzebra package.
|
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(
|
parser = argparse.ArgumentParser(
|
||||||
prog="pyzebra", formatter_class=argparse.ArgumentDefaultsHelpFormatter
|
prog="pyzebra", formatter_class=argparse.ArgumentDefaultsHelpFormatter
|
Reference in New Issue
Block a user