Compare commits
5 Commits
ec685d24eb
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 5dcf51b939 | |||
| f9844d6b82 | |||
| 040588d054 | |||
| cd4055b246 | |||
| 457a974e14 |
@@ -11,15 +11,8 @@ env:
|
|||||||
CONDA: /opt/miniforge3
|
CONDA: /opt/miniforge3
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prepare:
|
|
||||||
runs-on: pyzebra
|
|
||||||
steps:
|
|
||||||
- run: $CONDA/bin/conda config --add channels conda-forge
|
|
||||||
- run: $CONDA/bin/conda config --set solver libmamba
|
|
||||||
|
|
||||||
test-env:
|
test-env:
|
||||||
runs-on: pyzebra
|
runs-on: pyzebra
|
||||||
needs: prepare
|
|
||||||
if: github.ref == 'refs/heads/main'
|
if: github.ref == 'refs/heads/main'
|
||||||
env:
|
env:
|
||||||
BUILD_DIR: ${{ runner.temp }}/conda_build
|
BUILD_DIR: ${{ runner.temp }}/conda_build
|
||||||
@@ -33,7 +26,6 @@ jobs:
|
|||||||
|
|
||||||
prod-env:
|
prod-env:
|
||||||
runs-on: pyzebra
|
runs-on: pyzebra
|
||||||
needs: prepare
|
|
||||||
if: startsWith(github.ref, 'refs/tags/')
|
if: startsWith(github.ref, 'refs/tags/')
|
||||||
env:
|
env:
|
||||||
BUILD_DIR: ${{ runner.temp }}/conda_build
|
BUILD_DIR: ${{ runner.temp }}/conda_build
|
||||||
|
|||||||
@@ -17,15 +17,14 @@ build:
|
|||||||
|
|
||||||
requirements:
|
requirements:
|
||||||
host:
|
host:
|
||||||
- python >=3.8
|
- python {{ pyproject['project']['requires-python'] }}
|
||||||
- hatchling
|
- hatchling
|
||||||
run:
|
run:
|
||||||
- python >=3.8
|
- python {{ pyproject['project']['requires-python'] }}
|
||||||
{% for dep in pyproject['project']['dependencies'] %}
|
{% for dep in pyproject['project']['dependencies'] %}
|
||||||
- {{ dep }}
|
- {{ dep }}
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
|
|
||||||
|
|
||||||
about:
|
about:
|
||||||
home: {{ pyproject['project']['urls']['Homepage'] }}
|
home: {{ pyproject['project']['urls']['Homepage'] }}
|
||||||
summary: {{ pyproject['project']['description'] }}
|
summary: {{ pyproject['project']['description'] }}
|
||||||
|
|||||||
@@ -6,4 +6,4 @@ from pyzebra.sxtal_refgen import *
|
|||||||
from pyzebra.utils import *
|
from pyzebra.utils import *
|
||||||
from pyzebra.xtal import *
|
from pyzebra.xtal import *
|
||||||
|
|
||||||
__version__ = "0.7.11"
|
__version__ = "0.7.12"
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ REFLECTION_PRINTER_FORMATS = [
|
|||||||
"oksana",
|
"oksana",
|
||||||
]
|
]
|
||||||
|
|
||||||
ANATRIC_PATH = "/afs/psi.ch/project/sinq/rhel8/bin/anatric"
|
ANATRIC_PATH = "/opt/anatric"
|
||||||
ALGORITHMS = ["adaptivemaxcog", "adaptivedynamic"]
|
ALGORITHMS = ["adaptivemaxcog", "adaptivedynamic"]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import numpy as np
|
|||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
SXTAL_REFGEN_PATH = "/afs/psi.ch/project/sinq/rhel8/bin/Sxtal_Refgen"
|
SXTAL_REFGEN_PATH = "/opt/Sxtal_Refgen"
|
||||||
|
|
||||||
_zebraBI_default_geom = """GEOM 2 Bissecting - HiCHI
|
_zebraBI_default_geom = """GEOM 2 Bissecting - HiCHI
|
||||||
BLFR z-up
|
BLFR z-up
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import os
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
|
||||||
SINQ_PATH = "/afs/psi.ch/project/sinqdata"
|
SINQ_PATH = "/sq_data"
|
||||||
ZEBRA_PROPOSALS_PATH = os.path.join(SINQ_PATH, "{year}/zebra/{proposal}")
|
ZEBRA_PROPOSALS_PATH = os.path.join(SINQ_PATH, "{year}/zebra/{proposal}")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user