Skip to content

Commit 21d3a53

Browse files
author
Lucille Delisle
authored
Merge pull request #472 from lldelisle/remove_setup_py
change setup.py to project.toml
2 parents 105919b + 89baa12 commit 21d3a53

17 files changed

+209
-314
lines changed

MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
prune pygenometracks/tests

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ are highly customizable. Currently, it is possible to plot:
2626

2727
Here is a scheme which describe how pyGenomeTracks is working (graphical abstract of [Lopez-Delisle et al. 2020](https://doi.org/10.1093/bioinformatics/btaa692)):
2828

29-
![pyGenomeTracks](./docs/content/images/graphicalabstract.png)
29+
![pyGenomeTracks](https://github.com/deeptools/pyGenomeTracks/blob/b8918d43b0bd1ca9dd2939fdd0d93a5a297d0453/docs/content/images/graphicalabstract.png)
3030

3131
pyGenomeTracks can make plots with or without Hi-C data. The following is an example output of
3232
pyGenomeTracks from [Ramírez et al. 2017](https://www.nature.com/articles/s41467-017-02525-w)
3333

34-
![pyGenomeTracks example](./docs/content/images/hic_example_nat_comm_small.png)
34+
![pyGenomeTracks example](https://github.com/deeptools/pyGenomeTracks/blob/b8918d43b0bd1ca9dd2939fdd0d93a5a297d0453/docs/content/images/hic_example_nat_comm_small.png)
3535

3636
Table of content
3737
----------------

azure-pipelines.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ stages:
5454
cat requirements_CI.txt | awk -v v=$(matplotlib.version) -v vp=$(python.version) 'BEGIN{print "python =="vp}{if($0~/matplotlib/){$0="matplotlib =="v}; print}' > requirements_CI_updated.txt
5555
conda create -n pygenometracks --yes -c conda-forge -c bioconda --file requirements_CI_updated.txt
5656
source activate pygenometracks
57-
python setup.py install
57+
python -m pip install .
5858
displayName: installing dependencies
5959
- script: |
6060
source activate pygenometracks
@@ -91,7 +91,7 @@ stages:
9191
conda info -a
9292
cat requirements_CI.txt | awk -v v=$(matplotlib.version) -v vp=$(python.version) 'BEGIN{print "python =="vp}{if($0~/matplotlib/){$0="matplotlib =="v}; print}' > requirements_CI_updated.txt
9393
conda create -n pygenometracks --yes -c conda-forge -c bioconda --file requirements_CI_updated.txt
94-
python setup.py install
94+
python -m pip install .
9595
displayName: installing dependencies
9696
- script: |
9797
source activate pygenometracks
@@ -109,7 +109,9 @@ stages:
109109
container: python:3.8
110110
steps:
111111
- script: |
112-
python setup.py sdist bdist_wheel
112+
python -m pip install --upgrade pip
113+
pip install build
114+
python -m build
113115
python -m pip install --user --upgrade twine
114116
python -m twine upload -r pypi dist/*
115117
env:

bin/make_tracks_file

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

bin/pgt

Lines changed: 0 additions & 1 deletion
This file was deleted.

bin/pyGenomeTracks

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

docs/coverage.svg

Lines changed: 2 additions & 2 deletions
Loading

pygenometracks/_version.py

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

pygenometracks/makeTracksFile.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import argparse
22
import os
33
import sys
4+
from importlib.metadata import version
45
from pygenometracks.tracksClass import PlotTracks
56

6-
from pygenometracks._version import __version__
7-
87

98
def parse_arguments(args=None):
109

@@ -29,7 +28,7 @@ def parse_arguments(args=None):
2928
required=True)
3029

3130
parser.add_argument('--version', action='version',
32-
version=f'%(prog)s {__version__}')
31+
version=version('pyGenomeTracks'))
3332

3433
return parser
3534

pygenometracks/plotTracks.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,9 @@
146146
import argparse
147147
import warnings
148148

149+
from importlib.metadata import version
150+
149151
from pygenometracks.tracksClass import PlotTracks
150-
from pygenometracks._version import __version__
151152
from .utilities import InputError, get_region
152153
import matplotlib.pyplot as plt
153154

@@ -241,7 +242,7 @@ def parse_arguments(args=None):
241242
action='store_true')
242243

243244
parser.add_argument('--version', action='version',
244-
version=f'%(prog)s {__version__}')
245+
version=version('pyGenomeTracks'))
245246

246247
return parser
247248

0 commit comments

Comments
 (0)