From b6a788bb450437cf01146525d0f6f9189d608031 Mon Sep 17 00:00:00 2001 From: MatthieuDartiailh Date: Fri, 10 Jul 2020 22:18:16 -0400 Subject: [PATCH] update package naming for tools and docs --- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/docs.yml | 2 +- docs/source/conf.py | 2 +- setup.cfg | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 09bbd416..92e1dd82 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,19 +31,19 @@ jobs: run: | python -m pip install --upgrade pip pip install flake8 black isort mypy - pip install git+https://github.com/pyvisa/pyvisa.git#egg=pyvisa + pip install git+https://github.com/pyvisa/pyvisa.git@ext-rname#egg=pyvisa - name: Isort run: | - isort pyvisa-py -c; + isort pyvisa_y -c; - name: Black run: | - black pyvisa-py --check; + black pyvisa_py --check; - name: Flake8 run: | - flake8 pyvisa-py; + flake8 pyvisa_py; - name: Mypy run: | - mypy pyvisa-py; + mypy pyvisa_py; tests: name: Unit tests runs-on: ${{ matrix.os }} @@ -67,7 +67,7 @@ jobs: - name: Test with pytest run: | pip install pytest-cov - pytest pyvisa-py/testsuite --cov pyvisa-py --cov-report xml + pytest pyvisa_py/testsuite --cov pyvisa_py --cov-report xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v1 with: diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 77a45ab4..1430f040 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -27,7 +27,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip - pip install git+https://github.com/pyvisa/pyvisa.git#egg=pyvisa + pip install git+https://github.com/pyvisa/pyvisa.git@ext-rname#egg=pyvisa - name: Install project run: | python setup.py develop diff --git a/docs/source/conf.py b/docs/source/conf.py index 1f5dda87..533bea5b 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -56,7 +56,7 @@ # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the # built documents. -version = get_version(project) +version = get_version("pyvisa_py") release = version this_year = datetime.date.today().year copyright = "%s, %s" % (this_year, author) diff --git a/setup.cfg b/setup.cfg index 1031a0f1..2b8bb3d1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -36,9 +36,9 @@ platforms = Linux; Windows; Mac [options] packages = - pyvisa-py - pyvisa-py.protocols - pyvisa-py.testsuite + pyvisa_py + pyvisa_py.protocols + pyvisa_py.testsuite zip_safe = False install_requires = pyvisa>1.10.1