Skip to content

Commit 27201f0

Browse files
hanalysismencian
andauthored
Update telescope (#63719)
* updating to new release * update SHA for new tarball * updating package versions to match @marcos-da-conceicao suggestion here: mlbendall/telescope#57 (comment) * updating = to == * Updating all numpy * Updating build in recipe * Adding run_exports statement * Adding cython to build in recipe * Updating patch file to specify C compiler, fixing cython linting * fixing typo in packages * Adding setuptools back * Typos * Updating LDSHARED for macOS * Typo * Explicitly adding python3.6m for MacOS * Trigger build * Conditional linker arguments for macOS * Update meta.yaml * Update meta.yaml --------- Co-authored-by: Hannah Jones <hannah.18.jones@kcl.ac.uk> Co-authored-by: Joshua Zhuang <71105179+mencian@users.noreply.github.com>
1 parent 7e58813 commit 27201f0

File tree

4 files changed

+2675
-130
lines changed

4 files changed

+2675
-130
lines changed

recipes/telescope/0001-Fix-setup.py.patch

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,31 @@
1-
--- setup.py
2-
+++ setup.py
3-
@@ -5,7 +5,7 @@
1+
diff --git a/setup.py b/setup.py
2+
index c856074..a3feaa6 100644
3+
--- a/setup.py
4+
+++ b/setup.py
5+
@@ -4,33 +4,44 @@
6+
"""
47
from __future__ import print_function
58

9+
+import os
610
from os import path, environ
711
-from distutils.core import setup
812
+from setuptools import setup
913
from setuptools import Extension
1014
from setuptools import find_packages
15+
-
16+
from telescope._version import VERSION
17+
+import sys
1118

12-
@@ -16,13 +16,13 @@ __copyright__ = "Copyright (C) 2019 Matthew L. Bendall"
19+
__author__ = 'Matthew L. Bendall'
20+
__copyright__ = "Copyright (C) 2019 Matthew L. Bendall"
1321

1422
USE_CYTHON = True
1523

1624
-CONDA_PREFIX = environ.get("CONDA_PREFIX", '.')
25+
+CC = environ.get('CC', 'gcc')
26+
+os.environ['CC'] = CC
27+
+LDSHARED = environ.get('LDSHARED', CC + ' -shared')
28+
+os.environ['LDSHARED'] = LDSHARED
1729
+PREFIX = environ.get("PREFIX", '.')
1830
HTSLIB_INCLUDE_DIR = environ.get("HTSLIB_INCLUDE_DIR", None)
1931

@@ -26,3 +38,17 @@
2638
]
2739
htslib_include_dirs = [d for d in htslib_include_dirs if path.exists(str(d)) ]
2840

41+
+extra_link_args = []
42+
+if sys.platform == 'darwin':
43+
+ extra_link_args = ['-undefined', 'dynamic_lookup']
44+
+
45+
ext = '.pyx' if USE_CYTHON else '.c'
46+
extensions = [
47+
Extension("telescope.utils.calignment",
48+
["telescope/utils/calignment"+ext],
49+
include_dirs=htslib_include_dirs,
50+
+ extra_link_args=extra_link_args,
51+
+ language='c'
52+
),
53+
]
54+

recipes/telescope/build_failure.linux-64.yaml

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

recipes/telescope/meta.yaml

Lines changed: 24 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,47 @@
11
{% set name = "telescope" %}
2-
{% set version = "1.0.3" %}
2+
{% set version = "1.0.3_fix" %}
33

44
package:
55
name: {{ name|lower }}
66
version: {{ version }}
77

88
source:
9-
url: https://github.com/mlbendall/telescope/archive/v{{ version }}.tar.gz
10-
sha256: 115928f5aa347bf2416a15e9d790744e42553bb1118809b5677788e649269f74
9+
url: https://github.com/hanalysis/telescope/archive/v{{ version }}.tar.gz
10+
sha256: a508d3598f14e9df888c7fa48f982a59b735b65ab4d15b81a25a202d2af8b2a0
1111
patches:
1212
- 0001-Fix-setup.py.patch
1313

1414
build:
15-
number: 6
16-
skip: True # [py<30]
17-
script: {{ PYTHON }} -m pip install . --no-deps -vv
15+
number: 0
16+
skip: True # [py < 30]
17+
script: {{ PYTHON }} -m pip install . --no-deps --no-build-isolation --no-cache-dir -vvv
18+
run_exports:
19+
- {{ pin_subpackage(name, max_pin=None) }}
1820

1921
requirements:
2022
build:
2123
- {{ compiler('c') }}
2224
host:
2325
- pip
24-
- python
26+
- python ==3.6
27+
- cython ==0.29.7
2528
- setuptools
26-
- numpy >=1.16.3
27-
- scipy >=1.2.1
28-
- pysam >=0.15.2
29+
- numpy ==1.16.3
30+
- scipy ==1.2.1
31+
- pysam ==0.15.2
2932
- future >=0.17.1
3033
- pyyaml >=5.1
31-
- cython
32-
- intervaltree
33-
- htslib
34+
- intervaltree ==3.0.2
35+
- htslib ==1.9
36+
- pandas ==1.1.3
3437
run:
35-
- python
36-
- {{ pin_compatible('numpy') }}
37-
- scipy >=1.2.1
38-
- pysam >=0.15.2
38+
- python ==3.6
39+
- numpy ==1.16.3
40+
- scipy ==1.2.1
41+
- pysam ==0.15.2
3942
- future >=0.17.1
4043
- pyyaml >=5.1
41-
- intervaltree >=3.0.2
44+
- intervaltree ==3.0.2
4245

4346
test:
4447
commands:
@@ -48,11 +51,12 @@ test:
4851
- telescope resume -h &> /dev/null
4952

5053
about:
51-
home: 'https://github.com/mlbendall/telescope'
54+
home: "https://github.com/mlbendall/telescope"
5255
license: MIT
5356
license_family: MIT
5457
license_file: LICENSE
55-
summary: Single locus resolution of Transposable ELEment expression.
58+
summary: "Single locus resolution of Transposable ELEment expression."
59+
dev_url: "https://github.com/mlbendall/telescope"
5660

5761
extra:
5862
identifiers:

0 commit comments

Comments
 (0)