Skip to content

Commit f5dc384

Browse files
committed
Merge branch 'develop'
2 parents 7c4eb30 + 2f808e4 commit f5dc384

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+6794
-895
lines changed

.github/workflows/publish-to-pypi.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
id-token: write
1313
env:
1414
SDIST: python-icat-${{ github.event.release.tag_name }}.tar.gz
15+
PYPI_SDIST: python_icat-${{ github.event.release.tag_name }}.tar.gz
1516
steps:
1617
- name: Fetch assets
1718
uses: cb80/dlassets@latest
@@ -24,6 +25,8 @@ jobs:
2425
- name: Copy distfile to dist directory
2526
run: |
2627
mkdir -p dist
27-
cp -p assets/$SDIST dist
28-
- name: Upload distfile to PyPI
28+
cp -p assets/$SDIST dist/$PYPI_SDIST
29+
- name: Publish package to PyPI
2930
uses: pypa/gh-action-pypi-publish@release/v1
31+
with:
32+
verbose: true

CHANGES.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@ Changelog
22
=========
33

44

5+
.. _changes-1_7_0:
6+
7+
1.7.0 (2025-12-04)
8+
~~~~~~~~~~~~~~~~~~
9+
10+
New features
11+
------------
12+
13+
+ `#169`_: Add support for schema changes in icat.server 6.2.
14+
15+
.. _#169: https://github.com/icatproject/python-icat/pull/169
16+
17+
518
.. _changes-1_6_0:
619

720
1.6.0 (2024-12-06)

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ the reason why the example scripts require PyYAML.
5050
Copyright and License
5151
---------------------
5252

53-
Copyright 2013–2024
53+
Copyright 2013–2025
5454
Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
5555

5656
Licensed under the `Apache License`_, Version 2.0 (the "License"); you

doc/examples/example_data.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ data_publications:
4040
facility: example_facility
4141
fundingReferences:
4242
- fund1
43+
internalId: qwa2-gc-v9lp
4344
pid: DOI:00.0815/pub-00027
4445
publicationDate: 2022-10-31
4546
relatedItems:
@@ -51,6 +52,14 @@ data_publications:
5152
relationType: References
5253
title: The positive integers
5354
subject: integer sequence; OEIS; On-Line Encyclopedia of Integer Sequences
55+
subjects:
56+
- name: Special sequences and polynomials
57+
subjectScheme: "Mathematics Subject Classification \u2013 MSC2020"
58+
schemeURI: https://zbmath.org/classification/
59+
classificationCode: 11B83
60+
- name: integer sequence
61+
- name: OEIS
62+
- name: On-Line Encyclopedia of Integer Sequences
5463
title: Data from OEIS sequence A000027
5564
type: curated
5665
users:
@@ -134,6 +143,10 @@ fundings:
134143
awardNumber: AIS3241330750
135144
funderIdentifier: Crossref Funder ID:10.13039/100005376
136145
funderName: American Mathematical Society
146+
acknowledgement: >-
147+
This work has partly been supported by American Mathematical
148+
Society under grant number AIS3241330750 which is greatfully
149+
acknowledged
137150
instruments:
138151
e2:
139152
description: >
@@ -146,6 +159,8 @@ instruments:
146159
instrumentscientist: acord
147160
name: E2
148161
pid: DOI:00.0815/inst-00001
162+
startDate: 2007-01-01
163+
endDate: 2019-12-31
149164
technique: ndiff
150165
type: null
151166
eddi:

0 commit comments

Comments
 (0)