Skip to content

Commit df66950

Browse files
committed
Cleanup CI and deployment
1 parent 849d5ef commit df66950

File tree

6 files changed

+16
-16
lines changed

6 files changed

+16
-16
lines changed

.travis.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
language: python
22
python: '3.7'
33
install:
4+
- pip install "git+https://github.com/Droxef/pygsp.git@6b216395beae25bf062d13fbf9abc251eeb5bbff#egg=PyGSP"
45
- pip install -e .[tests]
56
script:
67
- black --check deepsphere/ scripts/
78
- python -m unittest discover -v
8-
#- isort -rc --check-only deepsphere/ scripts/
9+
- isort -rc --check-only deepsphere/ scripts/
910
- pylint-fail-under --rcfile=setup.cfg --fail_under 9.5 deepsphere/ scripts/
1011
deploy:
1112
provider: pypi

deepsphere/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import importlib
55
import sys
66

7-
__version__ = "0.1.13"
7+
__version__ = "0.2.0"
88

99

1010
def import_modules(names, src, dst):

pyproject.toml

+4-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ include_trailing_comma = true
88
force_grid_wrap = 0
99
use_parentheses = true
1010
line_length = 150
11+
known_third_party = ['sklearn', 'ignite', 'pygsp']
12+
1113
[build-system]
14+
build-backend = 'setuptools.build_meta'
1215
requires = [
1316
"setuptools >= 40.0.4",
1417
"setuptools_scm >= 2.0.0, <4",
1518
"wheel >= 0.29.0",
1619
]
17-
build-backend = 'setuptools.build_meta'
20+

requirements-tests.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
black==19.3b0
2-
isort[pyproject]==4.3.21
2+
isort[requirements,pyproject]==4.3.21
33
pre-commit==1.18.3
44
pylint==2.4.2
55
pylint-fail-under==0.3.0
66
Sphinx==2.2.0
7-
sphinx-rtd-theme
7+
sphinx-rtd-theme==0.4.3

requirements.txt

-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@ pyyaml==5.2
88
jupyter==1.0.0
99
pytorch-ignite==0.2.1
1010
pillow==6.2.2
11-
#

setup.py

+7-10
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,13 @@ def get_requirements(file_name):
3838

3939
for req in file.readlines():
4040
if not req.startswith("#"):
41-
#if req.startswith("git+"):
42-
#split_name = req.split("#")
43-
#start = split_name[-1].replace("egg=", "").strip()
44-
# end = split_name[0].replace("git+","").strip()
45-
# reqs.append(start + " @ " + end)
46-
#else:
47-
# reqs.append(req)
48-
reqs.append(req)
49-
50-
print(reqs)
41+
if req.startswith("git+"):
42+
name = req.split("#")[-1].replace("egg=", "").strip()
43+
req.replace("git+", "")
44+
reqs.append(f"{name} @ {req}")
45+
else:
46+
reqs.append(req)
47+
5148
return reqs
5249

5350

0 commit comments

Comments
 (0)