diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08c6975b845bde4022d7b124d7776defbb38960d..68216a55d59c2460a69a40a2eb6bdaafbb15efa9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ pytest: only: [merge_requests] script: - export LANG=C # Hopefully detect anything relying on locale - - python3 -m pip install ".[test]" --index-url https://devpi.exfldadev01.desy.de/euxfel/internal + - python3 -m pip install ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple - python3 -m pytest --color yes --verbose --cov=cal_tools --cov=xfel_calibrate --cov-report html:htmlcov --cov-report term coverage: '/TOTAL.*? (\d+(?:\.\d+)?\%)$/' artifacts: @@ -58,7 +58,7 @@ cython-editable-install-test: stage: test only: [merge_requests] script: - - python3 -m pip install -e ".[test]" --index-url https://devpi.exfldadev01.desy.de/euxfel/internal + - python3 -m pip install -e ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple - python3 -m pytest --color yes --verbose ./tests/test_cythonalgs.py automated_test: @@ -76,7 +76,7 @@ automated_test: - integration script: - export LANG=C # Hopefully detect anything relying on locale - - python3 -m pip install ".[test]" --index-url https://devpi.exfldadev01.desy.de/euxfel/internal + - python3 -m pip install ".[test]" --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple - python3 -c "from cal_tools.restful_config import restful_config; print(restful_config.get('calcat')['base-api-url'])" - echo "Running automated test. This can take sometime to finish depending on the test data." - echo "Given variables are REFERENCE=$REFERENCE, OUTPUT=$OUTPUT, DETECTORS=$DETECTORS, CALIBRATION=$CALIBRATION" diff --git a/setup.py b/setup.py index caa0e08067c6ac67afe47942412b92315b86ee4d..69705f2e2ff11805c291833f8658f2615acab2e9 100644 --- a/setup.py +++ b/setup.py @@ -109,14 +109,15 @@ install_requires = [ if "readthedocs.org" not in sys.executable: # These are in our own internal index, install with: - # --index-url https://devpi.exfldadev01.desy.de/euxfel/internal + # --index-url https://git.xfel.eu/api/v4/groups/501/-/packages/pypi/simple install_requires += [ "iCalibrationDB==2.4.3", "XFELDetectorAnalysis==2.7.2", # aka pyDetLib "CalParrot==0.3", # iminuit 1.3.8 is compatible with Python 3.11, but there isn't a 3.11 # wheel on PyPI, and building directly from source doesn't work. - "iminuit @ https://git.xfel.eu/api/v4/projects/4538/packages/generic/iminuit/1.3.8/iminuit-1.3.8-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", # noqa + # We have built a wheel & uploaded it on Gitlab. + "iminuit==1.3.8", ] setup(