Skip to content

Commit 46df2e3

Browse files
committed
Fixed gitignore for conda files
1 parent dc0cd18 commit 46df2e3

File tree

5 files changed

+53
-25
lines changed

5 files changed

+53
-25
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
build*
1+
build*/
22
*.obj
33
nbproject/private
44
builddir/

makefiles/conda/README.md

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Conda build instructions
2+
3+
Install miniconda (no need to deal with the huge full version). When asked
4+
for shell integration say "no". (It's actually "Hell No" but that's not a
5+
valid answer.)
6+
7+
Enter the conda environment:
8+
```bash
9+
source ~/miniconda3/bin/activate
10+
```
11+
12+
Get the build tools:
13+
14+
```bash
15+
(base) $ conda install conda-build
16+
```
17+
18+
Get this directory:
19+
```bash
20+
(base) $ git clone https://github.com/das-developers/das2C.git
21+
(base) $ cd das2C/makefiles
22+
```
23+
24+
Run conda build:
25+
```bash
26+
(base) $ conda build conda # Kinda weird, 2nd conda is a directory name
27+
```
28+
29+
Upload to anaconda.org
30+
```bash
31+
(base) $ anaconda upload -u dasdevelopers /Users/cwp/conda-bld/osx-64/das2C-2.3-pre3-py38h1de35cc_0.tar.bz2
32+
(or similar)
33+
```
34+
35+
Have users update:
36+
```bash
37+
(base) $ conda update -c dasdevelopers das2C
38+
```

makefiles/conda/bld.bat

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
set PYVER=%PY_VER%
21
set N_ARCH=/
32

43
rem set
@@ -30,22 +29,3 @@ nmake.exe /nologo /f makefiles\Windows.mak install
3029
if %ERRORLEVEL% NEQ 0 (
3130
EXIT /B 4
3231
)
33-
34-
nmake.exe /nologo /f makefiles\Windows.mak pylib
35-
36-
if %ERRORLEVEL% NEQ 0 (
37-
EXIT /B 5
38-
)
39-
40-
41-
nmake.exe /nologo /f makefiles\Windows.mak pylib_test
42-
43-
if %ERRORLEVEL% NEQ 0 (
44-
EXIT /B 6
45-
)
46-
47-
nmake.exe /nologo /f makefiles\Windows.mak pylib_install
48-
49-
if %ERRORLEVEL% NEQ 0 (
50-
EXIT /B 7
51-
)

makefiles/conda/build.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/usr/bin/env bash
2+
3+
N_ARCH=/
4+
5+
export N_ARCH
6+
7+
make
8+
make test
9+
make install

makefiles/conda/meta.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@
66
# openssl sha256 das2C-2.3-pre3.tar.gz | awk '{print $2}'
77

88
{% set name = "das2C" %}
9-
{% set version = "2.3-pre3" %}
9+
{% set conda_version = "2.3.rc3" %}
10+
{% set git_version = "2.3-pre3"}
1011
{% set sha256 = "6362189d746045b2294810f28d9319f60f1f035a3df71667a1d09677248f3e2e" %}
1112

1213

1314
package:
1415
name: {{ name }}
15-
version: {{ version }}
16+
version: {{ conda_version }}
1617

1718
source:
18-
fn: das2C-2.3-pre3.tar.gz
19-
url: https://github.com/das-developers/das2C/archive/refs/tags/v{{ version }}.tar.gz
19+
fn: das2C-{{ git_version }}.tar.gz
20+
url: https://github.com/das-developers/das2C/archive/refs/tags/v{{ git_version }}.tar.gz
2021
sha256: {{ sha256 }}
2122

2223

0 commit comments

Comments
 (0)