Skip to content

Commit

Permalink
synchronizing dependencies, added dev requirements to top-level package
Browse files Browse the repository at this point in the history
  • Loading branch information
Zeitsperre committed Dec 21, 2023
1 parent 5a42af2 commit 3af0f90
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 19 deletions.
6 changes: 4 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,11 @@
author = 'Birdhouse'

# The short X.Y version
# FIXME: this should reflect the version of cookiecutter-birdhouse
version = ''
# The full version, including alpha/beta/rc tags
release = '0.6.0'
# FIXME: this should reflect the version of cookiecutter-birdhouse
release = ''


# -- General configuration ---------------------------------------------------
Expand Down Expand Up @@ -63,7 +65,7 @@
#
# This is also used if you do content translation via gettext catalogs.
# Usually you set "language" from the command line for these cases.
language = None
language = "en"

# List of patterns, relative to source directory, that match files and
# directories to ignore when looking for source files.
Expand Down
8 changes: 6 additions & 2 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,16 @@ channels:
- conda-forge
dependencies:
- python>=3.7
- alabaster
- bump2version
- cookiecutter
- cookiecutter >=2.1.0
- cruft
- cryptography
- pip
- pytest
- psutil
- pytest >=6.2.4
- pytest-cookies
- pywps
- pyyaml
- sphinx >=7.0.0
- watchdog
8 changes: 4 additions & 4 deletions requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
alabaster
bump2version
cookiecutter>=1.7.0
cookiecutter>=2.1.0
cryptography
pytest-cookies
pytest>=5.3
PyYAML
sphinx>=1.7
pytest>=6.2.4
pyyaml
sphinx>=7.0.0
tox>=4.0
watchdog
20 changes: 18 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# !/usr/bin/env python

from distutils.core import setup
from setuptools import setup

setup(
name='cookiecutter-pypackage',
name='cookiecutter-birdhouse',
packages=[],
version='0.5.0',
description='Cookiecutter template for a PyWPS service',
Expand All @@ -12,6 +12,22 @@
author_email='[email protected]',
url='https://github.com/bird-house/cookiecutter-birdhouse',
keywords=['cookiecutter', 'template', 'package', 'wps' 'pywps', 'birdhouse'],
extras_require={
"dev": [
"black",
"bump2version",
"cookiecutter",
"cruft",
"cryptography",
"pip",
"psutil",
"pytest",
"pytest-cookies",
"pywps",
"pyyaml",
"watchdog"
]
},
python_requires='>=3.7',
classifiers=[
'Development Status :: 4 - Beta',
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ requires = pip >= 23.0
opts = -v

[testenv:docs]
basepython=python
changedir=docs
deps=sphinx
basepython = python
changedir = docs/source
deps = sphinx
commands=
sphinx-build -b html -d {envtmpdir}/doctrees . {envtmpdir}/html

Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ channels:
- defaults
dependencies:
- pip
- python>=3.7,<3.10
- python>=3.8,<3.12
- pywps>=4.5.1,<4.6
- jinja2
- click
Expand Down
8 changes: 4 additions & 4 deletions {{cookiecutter.project_slug}}/requirements_dev.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
pip>=19.2.3
pip>=23.1.0
{%- if cookiecutter.use_black == 'y' %}
black>=21.7b0
black>=23.12.0
{%- endif %}
bump2version>=0.5.11
coverage>=4.5.4
click>=7.0
cruft
flake8
nbval>=0.9.6
nbval>=0.10.0
{%- if cookiecutter.use_pytest == 'y' %}
pytest>=6.2.4
pytest-cov
Expand All @@ -16,5 +16,5 @@ pytest-notebook
{%- endif %}
sphinx>=1.8.5
tox>=4.0
twine>=1.14.0
twine>=4.0
wheel
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ min_version = 4.0
envlist =
py{38,39,310,311},
flake8
requires = pip >= 23.0
requires = pip >= 23.1.0
opts = -v

[testenv:flake8]
Expand Down

0 comments on commit 3af0f90

Please sign in to comment.