Changeset 6993c72 in OpenWorkouts-current for setup.py


Ignore:
Timestamp:
Feb 4, 2019, 1:10:40 PM (5 years ago)
Author:
Segundo Fdez <segun.2@…>
Branches:
current, feature/docs, master
Children:
d52ba50
Parents:
bf01534 (diff), 3357e47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into feature/ui

# Conflicts:
# ow/templates/profile.pt

File:
1 edited

Legend:

Unmodified
Added
Removed

  • setup.py

    rbf01534 r6993c72  
    2121    'waitress',
    2222    'repoze.folder',
    23     'repoze.catalog==0.8.4',
     23    'repoze.catalog @ git+https://github.com/WuShell/repoze.catalog.git@0.8.4'
     24    '#egg=repoze.catalog-0.8.4',
    2425    'bcrypt',
    2526    'FormEncode',
    … …  
    3940    'pytest-xdist',
    4041    'pytest-codestyle',
    41 ]
    42 
    43 dependency_links = [
    44     'git+https://github.com/WuShell/repoze.catalog.git@0.8.4'
    45     '#egg=repoze.catalog-0.8.4'
    4642]
    4743
    … …  
    6460    include_package_data=True,
    6561    zip_safe=False,
    66     dependency_links=dependency_links,
    6762    extras_require={
    6863        'testing': tests_require,
Note: See TracChangeset for help on using the changeset viewer.