Skip to content

Commit f80690c

Browse files
committed
Merge remote-tracking branch 'origin/master' into 38-delete-endpoints-do-not-work-if-they-do-not-parsejson
# Conflicts: # CHANGELOG.md # pyclowder/client.py
2 parents 6bfd173 + 1eb29b5 commit f80690c

File tree

16 files changed

+1575
-642
lines changed

16 files changed

+1575
-642
lines changed

.github/workflows/pypi.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010
jobs:
1111
publish:
1212
name: Build and publish python packages
13-
runs-on: ubuntu-18.04
13+
runs-on: ubuntu-22.04
1414

1515
steps:
16-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
1717

1818
- name: get release info
1919
id: release_info

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
88

99
Fix bug with delete. [#38](https://github.com/clowder-framework/pyclowder/issues/38)
1010

11+
## 3.0.0 - 2022-12-16
12+
This version adds Clowder 2 support and removes the old method of extractor registration in favor of reliance on heartbeats.
13+
14+
### Added
15+
- api/v1 and api/v2 code split for back compatibility as v2 is introduced.
16+
- new simplified ClowderClient is used in the new split endpoints for future refactoring.
17+
18+
### Removed
19+
- remove RABBITMQ_EXCHANGE parameter and REGISTRATION_URL parameter.
20+
- remove DatasetsAPI and object-oriented ClowderClient.
21+
22+
1123
## 2.7.0 - 2023-02-14
1224

1325
When extractors download a file from clowder it will ask clowder to not track that download.

Dockerfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@ ARG PYTHON_VERSION="2.7"
66
# environment variables
77
ENV PYTHON_VERSION=${PYTHON_VERSION} \
88
RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
9-
RABBITMQ_EXCHANGE="clowder" \
109
RABBITMQ_QUEUE="" \
1110
CLOWDER_URL="" \
12-
REGISTRATION_ENDPOINTS="" \
1311
EMAIL_SERVER="" \
1412
EMAIL_SENDER="extractor" \
1513
MAIN_SCRIPT=""

pyclowder/api/__init__.py

Whitespace-only changes.

pyclowder/api/v1/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)