Modernized wheel building

README.md

@@ -83,7 +83,6 @@ You can also use mdv as a **source code** viewer, best when you have docstrings
 from
 
 ```python
-~/terminal_markdown_viewer $ cat setup.py
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -92,7 +91,7 @@ from
 
 ## Usage
 
-    [sudo] ./setup.py install
+    pip install --upgrade .
 
 ----
 """

mdv/misc/results_perftests/out_commonmark.html

@@ -77,7 +77,7 @@
 <p>You can also use mdv as a <strong>source code</strong> viewer, best when you have docstrings with markdown in your code:</p>
 <p><img src="./samples/5.png" alt="" /></p>
 <p>from</p>
-<pre><code class="language-python">~/terminal_markdown_viewer $ cat setup.py
+<pre><code class="language-python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -86,7 +86,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -156,9 +156,9 @@ <h3>Manual Install: Setup</h3>
 <p>Distribution via setuptools. If setuptools is not installed, run:</p>
 <pre><code>pip install setuptools
 </code></pre>
-<p>Use the setup.py provided inside, I.e. run:</p>
-<pre><code>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+<p>Use pip, I.e. run:</p>
+<pre><code>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code></pre>
 <h2>Usage</h2>
 <h3>CLI</h3>
@@ -448,4 +448,4 @@ <h3>Sept 2018:</h3>
 | User           | Any                      |
 | Campaign       | Any                      |
 | Support Portal | <code>[cpeid, '=', a cpeid]</code>  |</p>
-</body></html>
+</body></html>

mdv/misc/results_perftests/out_markdown.html

@@ -78,7 +78,7 @@
 <p>You can also use mdv as a <strong>source code</strong> viewer, best when you have docstrings with markdown in your code:</p>
 <p><img alt="" src="./samples/5.png" /></p>
 <p>from</p>
-<pre><code class="python">~/terminal_markdown_viewer $ cat setup.py
+<pre><code class="python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -87,7 +87,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -157,9 +157,9 @@ <h3>Manual Install: Setup</h3>
 <p>Distribution via setuptools. If setuptools is not installed, run:</p>
 <pre><code>pip install setuptools
 </code></pre>
-<p>Use the setup.py provided inside, I.e. run:</p>
-<pre><code>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+<p>Use pip, I.e. run:</p>
+<pre><code>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code></pre>
 <h2>Usage</h2>
 <h3>CLI</h3>
@@ -471,4 +471,4 @@ <h3>Sept 2018:</h3>
 <td><code>[cpeid, '=', a cpeid]</code></td>
 </tr>
 </tbody>
-</table></body></html>
+</table></body></html>

mdv/misc/results_perftests/out_mistletoe.html

@@ -77,7 +77,7 @@
 <p>You can also use mdv as a <strong>source code</strong> viewer, best when you have docstrings with markdown in your code:</p>
 <p><img src="./samples/5.png" alt="" /></p>
 <p>from</p>
-<pre><code class="language-python">~/terminal_markdown_viewer $ cat setup.py
+<pre><code class="language-python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -86,7 +86,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -173,9 +173,9 @@ <h3>Manual Install: Setup</h3>
 <p>Distribution via setuptools. If setuptools is not installed, run:</p>
 <pre><code>pip install setuptools
 </code></pre>
-<p>Use the setup.py provided inside, I.e. run:</p>
-<pre><code>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+<p>Use pip, I.e. run:</p>
+<pre><code>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code></pre>
 <h2>Usage</h2>
 <h3>CLI</h3>
@@ -516,4 +516,4 @@ <h3>Sept 2018:</h3>
 </tr>
 </tbody>
 </table>
-</body></html>
+</body></html>

mdv/misc/results_perftests/out_mistletoe_ansi.html

@@ -135,7 +135,6 @@
 from
 
 \begin{lstlisting}[language=python]
-~/terminal_markdown_viewer $ cat setup.py
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -144,7 +143,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 """
@@ -273,11 +272,11 @@
 pip install setuptools
 \end{lstlisting}
 
-Use the setup.py provided inside, I.e. run:
+Use pip, I.e. run:
 
 \begin{lstlisting}[language=]
-sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 \end{lstlisting}
 
 \subsection{Usage}
@@ -686,4 +685,4 @@
 Support Portal & \verb|[cpeid, '=', a cpeid]|
 \end{tabular}
 \end{document}
-</body></html>
+</body></html>

mdv/misc/results_perftests/out_paka.html

@@ -64,7 +64,7 @@
 <p>You can also use mdv as a <strong>source code</strong> viewer, best when you have docstrings with markdown in your code:</p>
 <p><img src="./samples/5.png" alt="" /></p>
 <p>from</p>
-<pre><code class="language-python">~/terminal_markdown_viewer $ cat setup.py
+<pre><code class="language-python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -73,7 +73,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -141,9 +141,9 @@ <h3>Manual Install: Setup</h3>
 <p>Distribution via setuptools. If setuptools is not installed, run:</p>
 <pre><code>pip install setuptools
 </code></pre>
-<p>Use the setup.py provided inside, I.e. run:</p>
-<pre><code>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+<p>Use pip, I.e. run:</p>
+<pre><code>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code></pre>
 <h2>Usage</h2>
 <h3>CLI</h3>
@@ -422,4 +422,4 @@ <h3>Sept 2018:</h3>
 <img src="./samples/header_num.png" width="400"/>
 <p>tabletest</p>
 <p>| Date           | foo                      | |----------------|--------------------------| | User           | Any                      | | Campaign       | Any                      | | Support Portal | <code>[cpeid, '=', a cpeid]</code>  |</p>
-</body></html>
+</body></html>

mdv/misc/results_perftests/out_paka_breaks.html

@@ -77,7 +77,7 @@
 <p>You can also use mdv as a <strong>source code</strong> viewer, best when you have docstrings with markdown in your code:</p>
 <p><img src="./samples/5.png" alt="" /></p>
 <p>from</p>
-<pre><code class="language-python">~/terminal_markdown_viewer $ cat setup.py
+<pre><code class="language-python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -86,7 +86,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -156,9 +156,9 @@ <h3>Manual Install: Setup</h3>
 <p>Distribution via setuptools. If setuptools is not installed, run:</p>
 <pre><code>pip install setuptools
 </code></pre>
-<p>Use the setup.py provided inside, I.e. run:</p>
-<pre><code>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+<p>Use pip, I.e. run:</p>
+<pre><code>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code></pre>
 <h2>Usage</h2>
 <h3>CLI</h3>
@@ -448,4 +448,4 @@ <h3>Sept 2018:</h3>
 | User           | Any                      |<br />
 | Campaign       | Any                      |<br />
 | Support Portal | <code>[cpeid, '=', a cpeid]</code>  |</p>
-</body></html>
+</body></html>

mdv/misc/results_perftests/out_paka_xml.html

@@ -209,7 +209,7 @@
   <paragraph>
     <text>from</text>
   </paragraph>
-  <code_block info="python">~/terminal_markdown_viewer $ cat setup.py
+  <code_block info="python">
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -218,7 +218,7 @@
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 &quot;&quot;&quot;
@@ -417,10 +417,10 @@
   <code_block>pip install setuptools
 </code_block>
   <paragraph>
-    <text>Use the setup.py provided inside, I.e. run:</text>
+    <text>Use pip, I.e. run:</text>
   </paragraph>
-  <code_block>sudo ./setup.py install
-(or ./setup.py install --user to install only for the current user)
+  <code_block>sudo pip install --upgrade .
+(or just pip install --upgrade . to install only for the current user)
 </code_block>
   <heading level="2">
     <text>Usage</text>
@@ -985,4 +985,4 @@
     <text>  |</text>
   </paragraph>
 </document>
-</body></html>
+</body></html>

mdv/misc/test_md.md

@@ -90,7 +90,6 @@ You can also use mdv as a **source code** viewer, best when you have docstrings
 from
 
 ```python
-~/terminal_markdown_viewer $ cat setup.py
 #!/usr/bin/env python2.7
 # coding: utf-8
 
@@ -99,7 +98,7 @@ from
 
 ## Usage
 
-    [sudo] ./setup.py install
+    [sudo] pip install --upgrade .
 
 ----
 """
@@ -179,10 +178,10 @@ Distribution via setuptools. If setuptools is not installed, run:
     pip install setuptools
 
 
-Use the setup.py provided inside, I.e. run:
+Use pip, I.e. run:
 
-	sudo ./setup.py install
-    (or ./setup.py install --user to install only for the current user)
+	sudo pip install --upgrade .
+    (or just pip install --upgrade . to install only for the current user)
 
 
 

pypi_reminder.txt

@@ -1,9 +1,9 @@
 # thats the only way to get md into pypi:
 
 git push (for the images)
-vi setup.py -> add new version.
-rm -rf dist/
-python setup.py sdist
+vi setup.cfg -> add new version.
+rm -rf build/ dist/
+python3 -m build -nwsx .
 twine upload dist/*
 
 

pyproject.toml

@@ -0,0 +1,53 @@
+[build-system]
+requires = ["setuptools>=61.2", "setuptools_scm[toml]>=3.4.3"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "mdv"
+authors = [{name = "Axiros GmbH", email = "[email protected]"}]
+description = "Terminal Markdown Viewer"
+keywords = [
+    "markdown",
+    "markup",
+    "terminal",
+    "hilighting",
+    "syntax",
+    "source code",
+]
+classifiers = [
+    "Programming Language :: Python",
+    "Natural Language :: English",
+    "Operating System :: POSIX",
+    "Topic :: Text Processing :: Markup",
+    "License :: OSI Approved :: BSD License",
+    "Programming Language :: Python :: 2.7",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+]
+dependencies = ["pygments", "markdown"]
+dynamic = ["version"]
+
+[project.readme]
+file = "README.md"
+content-type = "text/markdown"
+
+[project.urls]
+Homepage = "http://github.com/axiros/terminal_markdown_viewer"
+Download = "http://github.com/axiros/terminal_markdown_viewer/tarball/"
+
+[project.optional-dependencies]
+yaml = ["pyyaml"]
+testing = ["pytest"]
+
+[project.scripts]
+mdv = "mdv:run"
+
+[tool.setuptools]
+include-package-data = true
+
+[tool.setuptools.packages.find]
+include = ["mdv", "mdv.*"]
+namespaces = false
+
+[tool.setuptools_scm]
+

setup.cfg

@@ -1,5 +1,3 @@
-[metadata]
-description-file = README.md
 [report]
 exclude_lines =
     pragma: no cover