diff --git a/MANIFEST.in b/MANIFEST.in index 6ca26c2..8f65558 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,6 +1,5 @@ include requirements.txt include tox.ini -include setup.py include MANIFEST.in include LICENSE.txt README.rst CONTRIBUTORS.rst CHANGELOG.rst include demos/* diff --git a/README.rst b/README.rst index 86cbaf3..33efb2d 100644 --- a/README.rst +++ b/README.rst @@ -166,7 +166,7 @@ CSS stylesheets. Installation ------------ -There are three ways to install ``svglib``. +Here are two ways to install ``svglib``. 1. Using ``pip`` ++++++++++++++++ @@ -198,24 +198,6 @@ using these simple commands:: `svglib with conda`_. -3. Manual installation -+++++++++++++++++++++++ - -Alternatively, you can install a tarball like ``svglib-.tar.gz`` -after downloading it from the `svglib page on PyPI`_ or the -`svglib releases page on GitHub`_ and executing a sequence of commands -like shown here:: - - $ tar xfz svglib-.tar.gz - $ cd svglib- - $ python setup.py install - -This will install a Python package named ``svglib`` in the -``site-packages`` subfolder of your Python installation and a script -tool named ``svg2pdf`` in your ``bin`` directory, e.g. in -``/usr/local/bin``. - - Testing ------- @@ -259,8 +241,6 @@ well as the versions of ``svglib``, ReportLab and Python being used! .. _RML: https://www.reportlab.com/software/rml-reference/ .. _svglib issue tracker: https://github.com/deeplook/svglib/issues .. _PyTest: http://pytest.org -.. _svglib page on PyPI: https://pypi.org/project/svglib/ -.. _svglib releases page on GitHub: https://github.com/deeplook/svglib/releases .. _Python file object: https://docs.python.org/3/glossary.html#term-file-object .. _Anaconda: https://www.anaconda.com/download/ .. _Miniconda: https://conda.io/miniconda.html diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..fed528d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" diff --git a/setup.py b/setup.py deleted file mode 100644 index 9eec0f0..0000000 --- a/setup.py +++ /dev/null @@ -1,13 +0,0 @@ -import sys -from setuptools import setup - -with open('requirements.txt', 'r') as f: - install_requires = f.read().strip().split() - -needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv) -pytest_runner = ['pytest-runner'] if needs_pytest else [] - -setup( - install_requires=install_requires, - setup_requires=[] + pytest_runner -) diff --git a/tests/README.rst b/tests/README.rst index 5d842a5..119d1ae 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -24,31 +24,6 @@ which is a simple ``pip install pytest``):: =============== 32 passed, 4 skipped in 49.18 seconds ================ -If for any reason you don't want to install ``pytest`` you can also -run the following (which installs ``pytest-runner`` during testing):: - - $ PYTHONPATH=. python setup.py test - running pytest - running egg_info - writing dependency_links to svglib.egg-info/dependency_links.txt - writing svglib.egg-info/PKG-INFO - writing requirements to svglib.egg-info/requires.txt - writing top-level names to svglib.egg-info/top_level.txt - reading manifest file 'svglib.egg-info/SOURCES.txt' - reading manifest template 'MANIFEST.in' - writing manifest file 'svglib.egg-info/SOURCES.txt' - running build_ext - ======================== test session starts ========================= - platform darwin -- Python 3…, pytest-3…, py-1…, pluggy-0… - rootdir: /Users/dinu/repos/github/deeplook/svglib, inifile: - plugins: cov-2… - collected 33 items - - tests/test_basic.py ......................... - tests/test_samples.py .s.s.s.s - - =============== 29 passed, 4 skipped in 38.95 seconds ================ - If you have ``tox`` installed (``pip install tox``) you can simply run the testsuite on Python 3.8 (assuming you have it installed) or on a single version (this will not run with ``conda``, yet, though)::