From 44d0134b091fd106ed184b5279ec341f84b19427 Mon Sep 17 00:00:00 2001
From: Gusev Anton <gusev_aa@groupbwt.com>
Date: Mon, 17 Jun 2019 18:41:22 +0300
Subject: [PATCH] fix merge errors
---
requirments.txt | 37 -------------------------------------
src/Pipfile | 10 ----------
src/Pipfile.lock | 36 ------------------------------------
3 files changed, 83 deletions(-)
delete mode 100644 requirments.txt
diff --git a/requirments.txt b/requirments.txt
deleted file mode 100644
index 041bd3a..0000000
--- a/requirments.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-alembic==1.0.10
-asn1crypto==0.24.0
-attrs==19.1.0
-Automat==0.7.0
-cffi==1.12.3
-constantly==15.1.0
-cryptography==2.7
-cssselect==1.0.3
-hyperlink==19.0.0
-idna==2.8
-incremental==17.5.0
-lxml==4.3.4
-Mako==1.0.12
-MarkupSafe==1.1.1
-mysqlclient==1.3.12
-parsel==1.5.1
-Pillow==6.0.0
-pyasn1==0.4.5
-pyasn1-modules==0.2.5
-pycparser==2.19
-PyDispatcher==2.0.5
-PyHamcrest==1.9.0
-PyMySQL==0.9.3
-pyOpenSSL==19.0.0
-pypiwin32==223
-python-dateutil==2.8.0
-python-dotenv==0.10.3
-python-editor==1.0.4
-pywin32==224
-queuelib==1.5.0
-Scrapy==1.6.0
-service-identity==18.1.0
-six==1.12.0
-SQLAlchemy==1.3.4
-Twisted==19.2.1
-w3lib==1.20.0
-zope.interface==4.6.0
diff --git a/src/Pipfile b/src/Pipfile
index 526ef4c..c6b99a2 100644
--- a/src/Pipfile
+++ b/src/Pipfile
@@ -4,25 +4,15 @@ url = "https://pypi.org/simple"
verify_ssl = true
[dev-packages]
-<<<<<<< HEAD
-=======
pypiwin32 = "*"
pywin32 = "*"
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
[packages]
scrapy = "*"
alembic = "*"
pillow = "*"
-<<<<<<< HEAD
-pypiwin32 = "*"
-mysqlclient = "==1.3.12"
-pymysql = "*"
-pywin32 = "*"
-=======
mysqlclient = "==1.3.12"
pymysql = "*"
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
sqlalchemy = "*"
python-dotenv = "*"
diff --git a/src/Pipfile.lock b/src/Pipfile.lock
index e54e90c..d437fd5 100644
--- a/src/Pipfile.lock
+++ b/src/Pipfile.lock
@@ -1,11 +1,7 @@
{
"_meta": {
"hash": {
-<<<<<<< HEAD
- "sha256": "a5acb54fbac860c3119859a4f584a7f0dbde94b70ecf51ac857f75c242461682"
-=======
"sha256": "bc66bb8bba165da3f9ac6bf489296d1200d95a8f330eb044a6f637de31358e4d"
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
},
"pipfile-spec": 6,
"requires": {
@@ -304,17 +300,6 @@
],
"version": "==19.0.0"
},
-<<<<<<< HEAD
- "pypiwin32": {
- "hashes": [
- "sha256:67adf399debc1d5d14dffc1ab5acacb800da569754fafdc576b2a039485aa775",
- "sha256:71be40c1fbd28594214ecaecb58e7aa8b708eabfa0125c8a109ebd51edbd776a"
- ],
- "index": "pypi",
- "version": "==223"
- },
-=======
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
"python-dateutil": {
"hashes": [
"sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb",
@@ -338,23 +323,6 @@
],
"version": "==1.0.4"
},
-<<<<<<< HEAD
- "pywin32": {
- "hashes": [
- "sha256:22e218832a54ed206452c8f3ca9eff07ef327f8e597569a4c2828be5eaa09a77",
- "sha256:32b37abafbfeddb0fe718008d6aada5a71efa2874f068bee1f9e703983dcc49a",
- "sha256:35451edb44162d2f603b5b18bd427bc88fcbc74849eaa7a7e7cfe0f507e5c0c8",
- "sha256:4eda2e1e50faa706ff8226195b84fbcbd542b08c842a9b15e303589f85bfb41c",
- "sha256:5f265d72588806e134c8e1ede8561739071626ea4cc25c12d526aa7b82416ae5",
- "sha256:6852ceac5fdd7a146b570655c37d9eacd520ed1eaeec051ff41c6fc94243d8bf",
- "sha256:6dbc4219fe45ece6a0cc6baafe0105604fdee551b5e876dc475d3955b77190ec",
- "sha256:9bd07746ce7f2198021a9fa187fa80df7b221ec5e4c234ab6f00ea355a3baf99"
- ],
- "index": "pypi",
- "version": "==224"
- },
-=======
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
"queuelib": {
"hashes": [
"sha256:42b413295551bdc24ed9376c1a2cd7d0b1b0fa4746b77b27ca2b797a276a1a17",
@@ -439,9 +407,6 @@
"version": "==4.6.0"
}
},
-<<<<<<< HEAD
- "develop": {}
-=======
"develop": {
"pypiwin32": {
"hashes": [
@@ -466,5 +431,4 @@
"version": "==224"
}
}
->>>>>>> bc30875ccf02fa0ef6226dba6e2a67ede1604382
}
--
GitLab