Skip to content

Commit 5f8962c

Browse files
committed
Merge branch 'fix-cwl-enum-schema-name' of https://github.com/crim-ca/weaver into fix-cwl-enum-schema-name
2 parents ac0f3bb + 55af1bc commit 5f8962c

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.readthedocs.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# configuration to setup readthedocs
22
version: 2
3+
build:
4+
os: ubuntu-22.04
5+
tools:
6+
python: "3.10"
37
sphinx:
48
configuration: docs/source/conf.py
59
#formats: all
610
formats:
711
- htmlzip
812
python:
9-
version: "3.8"
1013
install:
1114
- requirements: requirements-sys.txt
1215
- requirements: requirements-doc.txt

docker/docker-compose.yml.example

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ services:
2424
- mongodb
2525
volumes:
2626
# Weaver configuration
27-
- ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini
28-
- ./components/weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml
29-
- ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml
30-
- ./components/weaver/config/weaver/wps_processes.yml:/opt/local/src/weaver/config/wps_processes.yml
27+
- ./config/weaver.ini.example:/opt/local/src/weaver/config/weaver.ini
28+
- ./config/data_sources.yml.example:/opt/local/src/weaver/config/data_sources.yml
29+
- ./config/request_options.yml.example:/opt/local/src/weaver/config/request_options.yml
30+
- ./config/wps_processes.yml.example:/opt/local/src/weaver/config/wps_processes.yml
3131
# WARNING: see detail in 'worker' definition
3232
- /tmp/weaver/wps-outputs:/tmp/weaver/wps-outputs
3333
networks:
@@ -57,9 +57,10 @@ services:
5757
- mongodb
5858
volumes:
5959
# Weaver configuration
60-
- ./config/weaver.ini:/opt/local/src/weaver/config/weaver.ini
61-
- ./config/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml
62-
- ./config/request_options.yml:/opt/local/src/weaver/config/request_options.yml
60+
- ./config/weaver.ini.example:/opt/local/src/weaver/config/weaver.ini
61+
- ./config/data_sources.yml.example:/opt/local/src/weaver/config/data_sources.yml
62+
- ./config/request_options.yml.example:/opt/local/src/weaver/config/request_options.yml
63+
- ./config/wps_processes.yml.example:/opt/local/src/weaver/config/wps_processes.yml
6364
# WARNING:
6465
# If you need to provide some credentials to provide access to protected docker repositories
6566
- ~/.docker/config.json:/root/.docker/config.json

0 commit comments

Comments
 (0)