Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pyoncat source to conda #153

Merged
merged 9 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.autoreducer
Original file line number Diff line number Diff line change
Expand Up @@ -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)" && \
Expand Down
32 changes: 16 additions & 16 deletions conda_development.yml
Original file line number Diff line number Diff line change
@@ -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
44 changes: 23 additions & 21 deletions conda_environment.yml
Original file line number Diff line number Diff line change
@@ -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
Loading