Skip to content

Commit 076dbd5

Browse files
committed
Merge branch 'jenkins'
2 parents 7c7b488 + 5da527b commit 076dbd5

6 files changed

Lines changed: 19 additions & 6 deletions

File tree

conda.recipe/bld.bat

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
set PATH=d:\Programs\swigwin-4.0.0;%PATH%
2-
python setup.py install
1+
REM set PATH=d:\Programs\swigwin-4.0.0;%PATH%
2+
python setup.py build_ext --inplace
3+
python setup.py install --single-version-externally-managed --record=record.txt
34
if errorlevel 1 exit 1

conda.recipe/build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/bash
2+
python setup.py build_ext --inplace
3+
python setup.py install --single-version-externally-managed --record=record.txt # [unix]

conda.recipe/meta.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,15 @@ source:
1111
build:
1212
number: 0
1313
#skip: true
14-
script: python setup.py install --single-version-externally-managed --record=record.txt # [unix]
15-
script: python setup.py install --single-version-externally-managed --record=record.txt # [win]
1614

1715
requirements:
1816
build:
1917
- python
2018
- setuptools
2119
- numpy {{ numpy }}
22-
- swig
2320
- pandas >=0.23
2421
- pytest-runner >=5.0
22+
- swig
2523

2624
run:
2725
- python >=3.7

jenkins_dwr.bat

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
call C:\ProgramData\Anaconda3\Scripts\activate.bat C:\ProgramData\Anaconda3
2+
call conda create -n test_pyhecdss -y conda-build conda-verify numpy
3+
call conda activate test_pyhecdss
4+
call conda build conda.recipe
5+
if errorlevel 1 exit 1

jenkins_dwr.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
source /etc/profile.d/modules.sh
3+
module load python/miniconda3
4+
conda create -n test_pyhecdss -y conda-build conda-verify numpy
5+
source activate test_pyhecdss
6+
conda build conda.recipe

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def find_version(*file_paths):
7070
pyheclib_module = Extension('pyhecdss._pyheclib',
7171
sources=['pyhecdss/pyheclib.i',
7272
'pyhecdss/hecwrapper.c'],
73-
swig_opts=['-py3'],
73+
swig_opts=['-py3', ],
7474
libraries=libs,
7575
library_dirs=libdirs,
7676
extra_compile_args=compile_args,

0 commit comments

Comments
 (0)