Skip to content

Commit

Permalink
update package naming for tools and docs
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthieuDartiailh committed Jul 28, 2020
1 parent ac949d5 commit b6a788b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b6a788b

Please sign in to comment.