diff --git a/Dockerfile.autoreducer b/Dockerfile.autoreducer index bcdf3c2d..35b191a4 100644 --- a/Dockerfile.autoreducer +++ b/Dockerfile.autoreducer @@ -13,7 +13,7 @@ RUN useradd snsdata -G snswheel # put the developer configuration file in place RUN mkdir -p /etc/autoreduce/ RUN mkdir -p /opt/postprocessing/log/ -RUN curl https://raw.githubusercontent.com/neutrons/post_processing_agent/main/configuration/post_process_consumer.conf.development -o /etc/autoreduce/post_processing.conf +RUN curl https://raw.githubusercontent.com/neutrons/post_processing_agent/v2.7/configuration/post_process_consumer.conf.development -o /etc/autoreduce/post_processing.conf RUN yum install -y jq RUN contents="$(jq '.amq_queues[.amq_queues| length] |= . + "/queue/REDUCTION.CREATE_SCRIPT"' /etc/autoreduce/post_processing.conf)" && \ diff --git a/conda_development.yml b/conda_development.yml index ffedb599..c2aabe2f 100644 --- a/conda_development.yml +++ b/conda_development.yml @@ -1,18 +1,18 @@ channels: -- conda-forge + - conda-forge dependencies: -- build -- flake8 -- pytest<7 -- pytest-django -- pytest-cov -- python-dotenv -- python-build -- pre-commit -- sphinx -- sphinx_rtd_theme=1.2.* -- lxml -- pip -- pip: - - check-wheel-contents - - pytest-pythonpath + - build + - flake8 + - python-dotenv + - python-build + - pytest<7 + - pytest-django<4.6 + - pytest-cov + - pre-commit + - sphinx + - sphinx_rtd_theme=1.2.* + - lxml + - pip + - pip: + - check-wheel-contents + - pytest-pythonpath diff --git a/conda_environment.yml b/conda_environment.yml index 95a314ff..790ca87f 100644 --- a/conda_environment.yml +++ b/conda_environment.yml @@ -1,24 +1,26 @@ name: webmon channels: -- conda-forge + - conda-forge + - oncat dependencies: -- python=3.10 -- django=3.2 -- gunicorn -- httplib2 -- make -- oauthlib -- postgresql=14 -- psycopg2-binary=2.9.3 -- psutil -- python-ldap>=3.1 -- requests-oauthlib -- setuptools -- stomp.py=8 -- urllib3 -- versioningit~=1.1 -- pip -- pip: - - django-auth-ldap==4.1.0 - - django-health-check - - https://oncat.ornl.gov/packages/pyoncat-1.4.1-py3-none-any.whl + - python=3.10 + - django=3.2 + - gunicorn + - httplib2 + - make + - oauthlib + - postgresql=14 + - psycopg2-binary=2.9.3 + - psutil + - python-ldap>=3.1 + - requests-oauthlib + - setuptools + - stomp.py=8 + - urllib3 + - versioningit~=1.1 + - pyoncat + - sphinx_rtd_theme=1.2.* # readthedocs use this env file, and we need to install this theme here + - pip + - pip: + - django-auth-ldap==4.1.0 + - django-health-check