Skip to content

Commit 551e7f6

Browse files
committed
Builds under conda python3.7
1 parent 3b3ae0e commit 551e7f6

File tree

4 files changed

+79
-35
lines changed

4 files changed

+79
-35
lines changed

buildfiles/conda/bld.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
:: set PYVER=%PY_VER%
2-
:: set N_ARCH=/
2+
set N_ARCH=\
33

4+
set VCPKG_ROOT=C:\Users\pikerc\git\vcpkg
45
set DAS2C_LIBDIR=%BUILD_PREFIX%\lib
56
set DAS2C_INCDIR=%BUILD_PREFIX%\include
67

buildfiles/conda/description.html

Lines changed: 0 additions & 29 deletions
This file was deleted.

buildfiles/conda/description.md

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
This version of das2py provides support for dasStream version 3.0 while
2+
retaining backwards compatability to v2.3. If you have existing source
3+
code based on das2py, change calls of the form:
4+
```python
5+
lDs = das2.read_http()
6+
```
7+
to
8+
```python
9+
dHdr, lDs = das2.read_http()
10+
```
11+
because the stream header is returned as it's own dictionary instead of
12+
being merged into each dataset in the stream.
13+
14+
das2py versioning has been reset to match the github project and has
15+
switched to semantic versioning.
16+
Please issue:
17+
```bash
18+
conda remove das2py
19+
conda install dasdevelopers::das2py
20+
```
21+
22+
to update. This will provide version github tag 3.0-pre1, which is the
23+
newest release.
24+
25+
To test stream verification issue:
26+
```bash
27+
wget https://raw.githubusercontent.com/das-developers/das2py/main/test/ex96_yscan_multispec.d2t
28+
das_verify ex96_yscan_multispec.d2t
29+
```
30+
31+
To test plot generation issue:
32+
```bash
33+
conda install matplotlib # <-- if not already present
34+
wget https://raw.githubusercontent.com/das-developers/das2py/main/examples/ex09_cassini_fce_ephem_ticks.py
35+
python ex09_cassini_fce_ephem_ticks.py 2017-09-14
36+
okular cas_mag_fce_2017-09-14.png (or whichever PNG viewer you like)
37+
```
38+
You should get the same plot as the one
39+
[the one on github](https://github.com/das-developers/das2py/blob/main/examples/ex09_cassini_fce_ephem_ticks.png">ex09_cassini_fce_ephem_ticks.png)
40+
41+
Thanks for trying das2py v3 :)
42+

buildfiles/conda/meta.yaml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
# openssl sha256 das2py-tmp.tar.gz | awk '{print $2}'
66

77
{% set name = "das2py" %}
8-
{% set das2c_version = "3.0.0" %}
9-
{% set conda_version = "3.0.0" %}
10-
{% set git_version = "3.0.0" %}
11-
{% set bld_date = "20240527" %}
8+
{% set das2c_version = "3.0.2" %}
9+
{% set conda_version = "3.0.2" %}
10+
{% set git_version = "3.0.2" %}
11+
{% set bld_date = "20250206" %}
1212
# This sha-hash is not right, checkout next version of main to get correct one
13-
{% set sha256 = "f4a635898af682cf8cfb9e26d40418278e6d7a07c2e227033813fa4bda6e6b20" %}
13+
{% set sha256 = "7635b567991783ad59d7e1a0f551cdea19bb425c1a9e3cbb70f7eda517dcc538" %}
1414

1515
package:
1616
name: {{ name }}
@@ -57,6 +57,36 @@ test:
5757
imports:
5858
- das2
5959
- _das2
60+
source_files:
61+
- test/TestRead.py
62+
- test/test_read_empty.d2s
63+
- test/TestDasTime.py
64+
- test/TestCatalog.py
65+
- test/TestSortMinimal.py
66+
- test/ex08_dynaspec_namespace.d3t
67+
- test/ex05_waveform_extra.d3t
68+
- test/ex06_waveform_binary.d3b
69+
- test/ex08_dynaspec_namespace.d3t
70+
- test/ex12_sounder_xyz.d3t
71+
- test/ex13_object_annotation.d3t
72+
- test/ex14_object_tfcat.d3t
73+
- test/ex15_vector_frame.d3b
74+
- test/ex16_mag_grid_doc.d3x
75+
- test/ex96_yscan_multispec.d2t
76+
commands:
77+
- python test/TestRead.py
78+
- python test/TestDasTime.py
79+
- python test/TestCatalog.py
80+
- python test/TestSortMinimal.py
81+
- das_verify test/ex05_waveform_extra.d3t
82+
- das_verify test/ex06_waveform_binary.d3b
83+
- das_verify test/ex08_dynaspec_namespace.d3t
84+
- das_verify test/ex12_sounder_xyz.d3t
85+
- das_verify test/ex13_object_annotation.d3t
86+
- das_verify test/ex14_object_tfcat.d3t
87+
- das_verify test/ex15_vector_frame.d3b
88+
- das_verify test/ex16_mag_grid_doc.d3x
89+
- das_verify test/ex96_yscan_multispec.d2t
6090

6191
about:
6292
home: https://das2.org/das2py

0 commit comments

Comments
 (0)