Skip to content

Commit

Permalink
Qu1003 (#621)
Browse files Browse the repository at this point in the history
* use new peeringdb client (1.0.0) for pdb_load_data sync (#599)

* drop django-mobi for lack of py3/dj2 support (#492)
remove django-forms-bootstrap for lack of py3/dj2 support (#492)

* black formatted

* django2.2 and py3 upgrade (#492)

* drop ixlans (#21) ui and api changes

* drop local_asn (#168)

* org search (#193)

* phone number validation (#50)

* implement help text tooltips (#228)

* Mark own ASN as transit-free (#394)

* py3 fix for `pdb_migrate_ixlans` command when writing migration report

* pdb_migrate_ixlans: properly handle py3 Runtime error if ixlan dict changes during iteration

* set rest DEFAULT_SCHEMA_CLASS to coreapi to fix swagger apidocs
fix migration 0027 missing from facsimile manifest

* fix swagger doc strings

* fix tests that were broken from api doc fixes

* fix UniqueFieldValidator for netixlan ipaddress validation that broke during django/drf upgrade

* fix org merge tool layout issues

* travis config

* update pipfile and lock

* black formatting

* update travis dist

* beta mode banner (#411)

* add beta banner template (#411)

* automatically scheduled sync may not always be on, add a flag that lets us reflect that state in the beta banner message
clean up beta banner implementation (#411)

* add tests for beta banner (#411)
  • Loading branch information
grizz committed Jan 8, 2020
1 parent cf56acb commit ba6f9b6
Show file tree
Hide file tree
Showing 160 changed files with 4,184 additions and 2,077 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*.sqlite
*.swp
OLD.*
ci-dev.peeringdb.com/
config/facsimile/*.yaml
genstatic/
peeringdb_com
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: bionic
language: python
python:
- "2.7"
# - "3.6"
- "3.6"
branches:
except:
- gh-pages
Expand Down
97 changes: 54 additions & 43 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,56 +3,67 @@ name = "pypi"
url = "https://pypi.org/simple"
verify_ssl = true


[requires]
python_version = "3.6"


[dev-packages]
tox = ">2"
pytest = ">=2.8.7"
pytest-cov = ">=2.0.0"
pytest-django = ">=2.9.1"
pytest-filedata = ">=0.1.0"
jsonschema = ">=2.6.0"
facsimile = ">=1.1.1"
"twentyc.rpc" = ">=0.3.5,<0.5"


[packages]
certifi = "==2017.11.5"
ipaddress = "==1.0.19"
mysqlclient = "==1.3.9"
tld = "==0.7.6"
bleach = "==2.1.3"
coreapi = "==2.3.1"
googlemaps = "==2.5.1"
django-allauth = "==0.32.0"
django-autocomplete-light = "==3.2.9"
"django-bootstrap3" = "==9.0.0"
django-cors-middleware = "==1.3.1"
django-countries = "==4.6.1"
django-crispy-forms = "==1.6.1"
django-debug-toolbar = "==1.9.1"
django-extensions = "==1.3.3"
django-forms-bootstrap = "==3.1.0"
django-grappelli = "==2.10.1"
django-mobi = "==0.1.7"
django-oauth-toolkit = "==1.0.0"
django-phonenumber-field = "==0.6"
django-reversion = "==2.0.9"
django-rest-swagger = "==2.1.2"
djangorestframework = "==3.6.3"
"django-tables2" = "==1.0.4"
django-vanilla-views = "==1.0.2"
django-cors-headers = "==2.1.0"
django-ratelimit = "==1.1.0"
passlib = "==1.7.1"
django-hashers-passlib = "==0.3"
django-inet = "==0.3.2"
django-handleref = "==0.4.1"
django-namespace-perms = "==0.5.0"
django-peeringdb = "==1.0.0"
peeringdb = "==0.5.1"
rdap = "==0.2.0"
django = "==1.11.23"
uwsgi = "==2.0.14"
markdown = "==2.6.7"
"twentyc.rpc" = ">=0.3.5,<0.5"
django-simple-captcha = "==0.5.11"
unidecode = "==1.0.23"
# core requirements
django = ">=2.2, <2.3"
django-inet = ">=0.4.0, <0.5"
django-handleref = ">=0.5.0, <0.6"
django-namespace-perms = ">=0.6.0, <0.7"
django-peeringdb = ">=1.1.0, <1.2"
djangorestframework = ">=3.9.1, <3.12"
mysqlclient = ">=1.3.9"
peeringdb = ">=1.0.0, <2"
uwsgi = ">=2.0.14"

[requires]
python_version = "2.7"
# ancilary packages
bleach = ">=2.1.3"
django-allauth = ">=0.32.0"
django-simple-captcha = ">=0.5.11"
django-autocomplete-light = ">=3.2.9"
django-bootstrap3 = ">=9.0.0"
django-cors-middleware = ">=1.3.1"
django-cors-headers = ">=2.1.0"
django-countries = ">=4.6.1"
django-crispy-forms = ">=1.6.1"
django-debug-toolbar = ">=1.9.1"
django-extensions = ">=1.3.3"
django-grappelli = ">=2.10.1"
django-hashers-passlib = ">=0.3"
django-oauth-toolkit = ">=1.0.0"
django-phonenumber-field = ">=0.6"
django-ratelimit = ">=1.1.0"
django-rest-swagger = ">=2.1.2"
django-tables2 = ">=1.0.4"
django-vanilla-views = ">=1.0.2"
googlemaps = ">=2.5.1"
markdown = ">=2.6.7"
passlib = ">=1.7.1"
phonenumbers = ">=8.11.1"
unidecode = ">=1.0.23"

# these should just be pulled in automatically?
django-reversion = ">=3, <4"
certifi = ">=2017.11.5"
tld = ">=0.7.6"

# deprecated from drf -- used by rest swagger
coreapi = ">=2.3.1"

# TODO update
rdap = "==0.2.0"
Loading

0 comments on commit ba6f9b6

Please sign in to comment.