Verified Commit 3d779b63 authored by Silvio Rhatto's avatar Silvio Rhatto
Browse files

Fix: PyPI packaging

parent 2bae069e

Makefile

+6 −3
Original line number Diff line number Diff line
@@ -41,11 +41,14 @@ configs: 
# Packaging

#



build-package:

clean:

	@find -name __pycache__ -exec rm -rf {} \;



build-package: clean

	@python3 -m build



upload-test-package:

	@twine upload --repository testpypi dist/*

	@twine upload --skip-existing --repository testpypi dist/*



upload-package:

	@twine upload dist/*
 
	@twine upload --skip-existing dist/*

README.md

+7 −3
Original line number Diff line number Diff line
@@ -29,7 +29,11 @@ On [Debian](https://debian.org), they can be installed using 


## Installation



Just clone the repository

Onionprobe is [available on PyPI](https://pypi.org/project/keyring/):



    pip install onionprobe



It's also possible to run it directly from the Git repository:



    git clone https://gitlab.torproject.org/tpo/onion-services/onionprobe

    cd onionprobe
@@ -40,11 +44,11 @@ Right now Onionprobe works only with a configuration file. 
A [detailed sample config](configs/tor.yaml) is provided and can be invoked

with:



    ./onionprobe -c configs/tor.yaml

    onionprobe -c configs/tor.yaml



Full usage and available metrics is provided passing the `-h` flag:



    ./onionprobe -h

    onionprobe -h

    usage: onionprobe [-h] [-c CONFIG] [-e [onion-address1 ...]]



    Test and monitor onion services

modules/onionprobe/config.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ except ImportError: 
# The Onionprobe version string

# Uses Semantic Versioning 2.0.0

# See https://semver.org

onionprobe_version = '0.2.0'

onionprobe_version = '0.2.1'



# The base path for this project

basepath = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir, os.pardir) + os.sep

setup.cfg

+2 −2
Original line number Diff line number Diff line 
[metadata]

name                          = onionprobe

version                       = 0.2.0

version                       = 0.2.1

url                           = https://gitlab.torproject.org/tpo/onion-services/onionprobe

author                        = Silvio Rhatto

author_email                  = rhatto@torproject.org
@@ -33,7 +33,7 @@ package_dir = 
install_requires =

    requests

    stem

    prometheus-client-python

    prometheus-client

    pyyaml

    pysocks

    cryptography