Skip to content

Commit

Permalink
fix(deps): Reorganize dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswmackey authored and Chris Mackey committed Mar 8, 2023
1 parent 5ef4b9c commit ce0ede7
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 13 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
name: Unit tests
strategy:
matrix:
python-version: [2.7, 3.7]
python-version: [3.7]
os: [macos-latest, ubuntu-latest, windows-latest]

runs-on: ${{ matrix.os }}
Expand All @@ -22,7 +22,7 @@ jobs:
- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r cli-requirements.txt
pip install -r dev-requirements.txt
- name: run tests
run: python -m pytest --cov=. tests/
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
- name: install python dependencies
run: |
python -m pip install --upgrade pip
pip install -r requirements.txt
pip install -r cli-requirements.txt
pip install -r dev-requirements.txt
- name: install semantic-release
run:
Expand Down Expand Up @@ -95,6 +95,7 @@ jobs:
- name: install dependencies
run: |
pip install -U .
pip install -r cli-requirements.txt
pip install -r dev-requirements.txt
sphinx-apidoc -f -e -d 4 -o ./docs ./uwg
sphinx-build -b html ./docs ./docs/_build/docs
Expand Down
2 changes: 1 addition & 1 deletion cli-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
click==7.1.2
click>=7.1.2
uwg-schema==0.2.11;python_version>='3.7'
8 changes: 3 additions & 5 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
click==7.1.2
uwg-schema==0.2.8;python_version>='3.6'
coverage==5.5
coveralls==1.7.0;python_version<'3.0'
coveralls==2.2.0;python_version>='3.6'
Expand All @@ -8,16 +6,16 @@ pytest==6.2.4;python_version>='3.6'
pytest-cov==2.12.0
Sphinx==1.8.5;python_version<'3.0'
Sphinx==3.3.1;python_version>='3.6'
sphinx-bootstrap-theme==0.7.1
sphinx-bootstrap-theme==0.8.1
sphinxcontrib-fulltoc==1.2.0
sphinxcontrib-websupport==1.1.2;python_version<'3.0'
sphinxcontrib-websupport==1.2.4;python_version>='3.6'
sphinx-click==2.7.1
twine==1.13.0;python_version<'3.0'
twine==3.4.1;python_version>='3.6'
wheel==0.36.2
wheel==0.38.1
setuptools==44.1.0;python_version<'3.0'
setuptools==57.0.0;python_version>='3.6'
setuptools==65.5.1;python_version>='3.6'
importlib-metadata==4.3.1;python_version>='3.6'
importlib-metadata==2.0.0;python_version<'3.0'
jinja2==3.0.3;python_version>='3.6'
Expand Down
8 changes: 8 additions & 0 deletions docs/_static/custom.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@
.bs-sidenav .nav > .active > ul {
display: block;
}
div.bs-sidenav ul {
margin-bottom: 0;
padding-left: 5px;
list-style: none;
}
div.bs-sidenav a {
color: #333333;
}
/* Widen the fixed sidenav */
.bs-sidenav.affix,
.bs-sidenav.affix-bottom {
Expand Down
5 changes: 1 addition & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
with open("README.md", "r") as fh:
long_description = fh.read()

with open('requirements.txt') as f:
requirements = f.read().splitlines()

with open('cli-requirements.txt') as f:
cli_requirements = f.read().splitlines()

Expand All @@ -21,7 +18,7 @@
url="https://github.com/ladybug-tools/uwg",
packages=setuptools.find_packages(exclude=["tests*", "resources*"]),
include_package_data=True,
install_requires=requirements,
install_requires=[],
extras_require={
'cli': cli_requirements
},
Expand Down

0 comments on commit ce0ede7

Please sign in to comment.